diff --git a/modules/po/admindebug.bg_BG.po b/modules/po/admindebug.bg_BG.po index 9dd3d364..dd4060ea 100644 --- a/modules/po/admindebug.bg_BG.po +++ b/modules/po/admindebug.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/admindebug.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/admindebug.de_DE.po b/modules/po/admindebug.de_DE.po index 1c50e51b..4413da9e 100644 --- a/modules/po/admindebug.de_DE.po +++ b/modules/po/admindebug.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/admindebug.es_ES.po b/modules/po/admindebug.es_ES.po index 6b5974d6..469bbcc7 100644 --- a/modules/po/admindebug.es_ES.po +++ b/modules/po/admindebug.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 2ec7dc3c..3840f15f 100644 --- a/modules/po/admindebug.fr_FR.po +++ b/modules/po/admindebug.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f17d8d08..e4a356eb 100644 --- a/modules/po/admindebug.id_ID.po +++ b/modules/po/admindebug.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d41b3b0d..eb6c1be0 100644 --- a/modules/po/admindebug.it_IT.po +++ b/modules/po/admindebug.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/admindebug.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 29859a4a..aee7e626 100644 --- a/modules/po/admindebug.nl_NL.po +++ b/modules/po/admindebug.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/admindebug.pt_BR.po b/modules/po/admindebug.pt_BR.po index 419dc312..fe991e88 100644 --- a/modules/po/admindebug.pt_BR.po +++ b/modules/po/admindebug.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 10e36fe3..58d898d6 100644 --- a/modules/po/admindebug.ru_RU.po +++ b/modules/po/admindebug.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/admindebug.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 fba67204..8fae2066 100644 --- a/modules/po/adminlog.bg_BG.po +++ b/modules/po/adminlog.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/adminlog.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/adminlog.de_DE.po b/modules/po/adminlog.de_DE.po index b64384b6..136643b2 100644 --- a/modules/po/adminlog.de_DE.po +++ b/modules/po/adminlog.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/adminlog.es_ES.po b/modules/po/adminlog.es_ES.po index de9dc917..8191ea4b 100644 --- a/modules/po/adminlog.es_ES.po +++ b/modules/po/adminlog.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 253abf1b..b84dceb5 100644 --- a/modules/po/adminlog.fr_FR.po +++ b/modules/po/adminlog.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f5723e8f..f8e4bcf7 100644 --- a/modules/po/adminlog.id_ID.po +++ b/modules/po/adminlog.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c969a240..730a35ab 100644 --- a/modules/po/adminlog.it_IT.po +++ b/modules/po/adminlog.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/adminlog.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 73d05efb..25cb416d 100644 --- a/modules/po/adminlog.nl_NL.po +++ b/modules/po/adminlog.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/adminlog.pt_BR.po b/modules/po/adminlog.pt_BR.po index 430d2e4d..360f5772 100644 --- a/modules/po/adminlog.pt_BR.po +++ b/modules/po/adminlog.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 1efe9261..ba28b042 100644 --- a/modules/po/adminlog.ru_RU.po +++ b/modules/po/adminlog.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/adminlog.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 5b3873ab..8eb30726 100644 --- a/modules/po/alias.bg_BG.po +++ b/modules/po/alias.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/alias.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/alias.de_DE.po b/modules/po/alias.de_DE.po index 639fccbb..2e9988c7 100644 --- a/modules/po/alias.de_DE.po +++ b/modules/po/alias.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/alias.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/alias.es_ES.po b/modules/po/alias.es_ES.po index a2999afe..f05140f1 100644 --- a/modules/po/alias.es_ES.po +++ b/modules/po/alias.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/alias.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 eca8a14c..8a5bb5f6 100644 --- a/modules/po/alias.fr_FR.po +++ b/modules/po/alias.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/alias.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 7bec85fb..5d67ecef 100644 --- a/modules/po/alias.id_ID.po +++ b/modules/po/alias.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/alias.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 69ba547b..b284698a 100644 --- a/modules/po/alias.it_IT.po +++ b/modules/po/alias.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/alias.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/alias.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f6406029..20e8b76e 100644 --- a/modules/po/alias.nl_NL.po +++ b/modules/po/alias.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/alias.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/alias.pt_BR.po b/modules/po/alias.pt_BR.po index 0b6ecf04..4348bbb1 100644 --- a/modules/po/alias.pt_BR.po +++ b/modules/po/alias.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/alias.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 93ef4e36..81ddf964 100644 --- a/modules/po/alias.ru_RU.po +++ b/modules/po/alias.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/alias.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b1ca426a..4ee5b1ca 100644 --- a/modules/po/autoattach.bg_BG.po +++ b/modules/po/autoattach.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/autoattach.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/autoattach.de_DE.po b/modules/po/autoattach.de_DE.po index 012ee688..36ae82ac 100644 --- a/modules/po/autoattach.de_DE.po +++ b/modules/po/autoattach.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/autoattach.es_ES.po b/modules/po/autoattach.es_ES.po index 35516fd3..ca9417fc 100644 --- a/modules/po/autoattach.es_ES.po +++ b/modules/po/autoattach.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 61b65e1f..f427a466 100644 --- a/modules/po/autoattach.fr_FR.po +++ b/modules/po/autoattach.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 31feb3fc..73b5a69b 100644 --- a/modules/po/autoattach.id_ID.po +++ b/modules/po/autoattach.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 a6041943..bf99c339 100644 --- a/modules/po/autoattach.it_IT.po +++ b/modules/po/autoattach.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/autoattach.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 530dc8f0..d3aad432 100644 --- a/modules/po/autoattach.nl_NL.po +++ b/modules/po/autoattach.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/autoattach.pt_BR.po b/modules/po/autoattach.pt_BR.po index 8bca6f0f..be22cd28 100644 --- a/modules/po/autoattach.pt_BR.po +++ b/modules/po/autoattach.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c8ed39d2..1fb0ec3c 100644 --- a/modules/po/autoattach.ru_RU.po +++ b/modules/po/autoattach.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/autoattach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0a8dbb90..a6b967d8 100644 --- a/modules/po/autocycle.bg_BG.po +++ b/modules/po/autocycle.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/autocycle.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -58,7 +52,6 @@ msgstr "" msgid "Usage: Del [!]<#chan>" msgstr "" -<<<<<<< HEAD #: autocycle.cpp:85 autocycle.cpp:90 autocycle.cpp:95 msgid "Channel" msgstr "" @@ -72,20 +65,5 @@ msgid "List of channel masks and channel masks with ! before them." msgstr "" #: autocycle.cpp:235 -======= -#: autocycle.cpp:85 autocycle.cpp:89 autocycle.cpp:94 -msgid "Channel" -msgstr "" - -#: autocycle.cpp:100 -msgid "You have no entries." -msgstr "" - -#: autocycle.cpp:229 -msgid "List of channel masks and channel masks with ! before them." -msgstr "" - -#: autocycle.cpp:234 ->>>>>>> 1.7.x msgid "Rejoins channels to gain Op if you're the only user left" msgstr "" diff --git a/modules/po/autocycle.de_DE.po b/modules/po/autocycle.de_DE.po index ea78c459..146b5bfe 100644 --- a/modules/po/autocycle.de_DE.po +++ b/modules/po/autocycle.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/autocycle.es_ES.po b/modules/po/autocycle.es_ES.po index 8f7d9bb0..0fee230e 100644 --- a/modules/po/autocycle.es_ES.po +++ b/modules/po/autocycle.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 54ad87ee..39bc3a29 100644 --- a/modules/po/autocycle.fr_FR.po +++ b/modules/po/autocycle.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0a33df69..fb212006 100644 --- a/modules/po/autocycle.id_ID.po +++ b/modules/po/autocycle.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 de51a97f..00a7b106 100644 --- a/modules/po/autocycle.it_IT.po +++ b/modules/po/autocycle.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/autocycle.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Italian\n" "Language: it_IT\n" @@ -58,7 +52,6 @@ msgstr "" msgid "Usage: Del [!]<#chan>" msgstr "" -<<<<<<< HEAD #: autocycle.cpp:85 autocycle.cpp:90 autocycle.cpp:95 msgid "Channel" msgstr "" @@ -72,20 +65,5 @@ msgid "List of channel masks and channel masks with ! before them." msgstr "" #: autocycle.cpp:235 -======= -#: autocycle.cpp:85 autocycle.cpp:89 autocycle.cpp:94 -msgid "Channel" -msgstr "" - -#: autocycle.cpp:100 -msgid "You have no entries." -msgstr "" - -#: autocycle.cpp:229 -msgid "List of channel masks and channel masks with ! before them." -msgstr "" - -#: autocycle.cpp:234 ->>>>>>> 1.7.x msgid "Rejoins channels to gain Op if you're the only user left" msgstr "" diff --git a/modules/po/autocycle.nl_NL.po b/modules/po/autocycle.nl_NL.po index 50900bbc..a2319dda 100644 --- a/modules/po/autocycle.nl_NL.po +++ b/modules/po/autocycle.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/autocycle.pt_BR.po b/modules/po/autocycle.pt_BR.po index 46e91e72..79e9f16b 100644 --- a/modules/po/autocycle.pt_BR.po +++ b/modules/po/autocycle.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 076e25fd..6ab69a4f 100644 --- a/modules/po/autocycle.ru_RU.po +++ b/modules/po/autocycle.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/autocycle.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 fddd3155..a9cb45ce 100644 --- a/modules/po/autoop.bg_BG.po +++ b/modules/po/autoop.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/autoop.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/autoop.de_DE.po b/modules/po/autoop.de_DE.po index cccc8ee8..d3182bad 100644 --- a/modules/po/autoop.de_DE.po +++ b/modules/po/autoop.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/autoop.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/autoop.es_ES.po b/modules/po/autoop.es_ES.po index e5c52733..75bb9d1e 100644 --- a/modules/po/autoop.es_ES.po +++ b/modules/po/autoop.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/autoop.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 88031335..76a87905 100644 --- a/modules/po/autoop.fr_FR.po +++ b/modules/po/autoop.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/autoop.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8a61ed76..3adaa6e8 100644 --- a/modules/po/autoop.id_ID.po +++ b/modules/po/autoop.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/autoop.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 bf0ab587..3458920c 100644 --- a/modules/po/autoop.it_IT.po +++ b/modules/po/autoop.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoop.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/autoop.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 500d176e..e8ff8695 100644 --- a/modules/po/autoop.nl_NL.po +++ b/modules/po/autoop.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/autoop.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/autoop.pt_BR.po b/modules/po/autoop.pt_BR.po index 85cc641c..c224c8ab 100644 --- a/modules/po/autoop.pt_BR.po +++ b/modules/po/autoop.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/autoop.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 85f721f1..028f5a6f 100644 --- a/modules/po/autoop.ru_RU.po +++ b/modules/po/autoop.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/autoop.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 cb0252a4..48a714f2 100644 --- a/modules/po/autoreply.bg_BG.po +++ b/modules/po/autoreply.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/autoreply.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/autoreply.de_DE.po b/modules/po/autoreply.de_DE.po index 662c95ff..91b8dccf 100644 --- a/modules/po/autoreply.de_DE.po +++ b/modules/po/autoreply.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/autoreply.es_ES.po b/modules/po/autoreply.es_ES.po index 3d219079..87ce34d6 100644 --- a/modules/po/autoreply.es_ES.po +++ b/modules/po/autoreply.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 433b61f6..1a025f34 100644 --- a/modules/po/autoreply.fr_FR.po +++ b/modules/po/autoreply.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f8ec540e..94188533 100644 --- a/modules/po/autoreply.id_ID.po +++ b/modules/po/autoreply.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 47148fef..965724c0 100644 --- a/modules/po/autoreply.it_IT.po +++ b/modules/po/autoreply.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/autoreply.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 249517ed..691ebe4e 100644 --- a/modules/po/autoreply.nl_NL.po +++ b/modules/po/autoreply.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/autoreply.pt_BR.po b/modules/po/autoreply.pt_BR.po index 4edea4c0..9c205a88 100644 --- a/modules/po/autoreply.pt_BR.po +++ b/modules/po/autoreply.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 5c3cdd4d..ee488dad 100644 --- a/modules/po/autoreply.ru_RU.po +++ b/modules/po/autoreply.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/autoreply.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 283ba68f..e4c71ffa 100644 --- a/modules/po/autovoice.bg_BG.po +++ b/modules/po/autovoice.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/autovoice.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/autovoice.de_DE.po b/modules/po/autovoice.de_DE.po index db89f893..0a7ec8fb 100644 --- a/modules/po/autovoice.de_DE.po +++ b/modules/po/autovoice.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/autovoice.es_ES.po b/modules/po/autovoice.es_ES.po index 5922c9a3..2170f39f 100644 --- a/modules/po/autovoice.es_ES.po +++ b/modules/po/autovoice.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ae189509..74092368 100644 --- a/modules/po/autovoice.fr_FR.po +++ b/modules/po/autovoice.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 af8edf07..3f003b80 100644 --- a/modules/po/autovoice.id_ID.po +++ b/modules/po/autovoice.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 aa5f6cd8..8014d56c 100644 --- a/modules/po/autovoice.it_IT.po +++ b/modules/po/autovoice.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/autovoice.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 97f2709d..aa84aa10 100644 --- a/modules/po/autovoice.nl_NL.po +++ b/modules/po/autovoice.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/autovoice.pt_BR.po b/modules/po/autovoice.pt_BR.po index a18dfded..9afcafab 100644 --- a/modules/po/autovoice.pt_BR.po +++ b/modules/po/autovoice.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f3d8e9cb..510ef0c1 100644 --- a/modules/po/autovoice.ru_RU.po +++ b/modules/po/autovoice.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/autovoice.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b9e67039..de923c19 100644 --- a/modules/po/awaystore.bg_BG.po +++ b/modules/po/awaystore.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/awaystore.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/awaystore.de_DE.po b/modules/po/awaystore.de_DE.po index fa6ced75..b4848850 100644 --- a/modules/po/awaystore.de_DE.po +++ b/modules/po/awaystore.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/awaystore.es_ES.po b/modules/po/awaystore.es_ES.po index 8cbebf0e..bf33ceb0 100644 --- a/modules/po/awaystore.es_ES.po +++ b/modules/po/awaystore.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 2c9c267b..fad4ae42 100644 --- a/modules/po/awaystore.fr_FR.po +++ b/modules/po/awaystore.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 4cacbc05..661c44f1 100644 --- a/modules/po/awaystore.id_ID.po +++ b/modules/po/awaystore.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c20e243a..a0425aa9 100644 --- a/modules/po/awaystore.it_IT.po +++ b/modules/po/awaystore.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/awaystore.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 713dac2a..2f654145 100644 --- a/modules/po/awaystore.nl_NL.po +++ b/modules/po/awaystore.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/awaystore.pt_BR.po b/modules/po/awaystore.pt_BR.po index 41e1f9fd..fb4865ec 100644 --- a/modules/po/awaystore.pt_BR.po +++ b/modules/po/awaystore.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c8a338a2..fe62391a 100644 --- a/modules/po/awaystore.ru_RU.po +++ b/modules/po/awaystore.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/awaystore.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e31a2518..687f1dd1 100644 --- a/modules/po/block_motd.bg_BG.po +++ b/modules/po/block_motd.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/block_motd.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/block_motd.de_DE.po b/modules/po/block_motd.de_DE.po index 29669518..db0658c6 100644 --- a/modules/po/block_motd.de_DE.po +++ b/modules/po/block_motd.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/block_motd.es_ES.po b/modules/po/block_motd.es_ES.po index f0320528..1626eca6 100644 --- a/modules/po/block_motd.es_ES.po +++ b/modules/po/block_motd.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e8484b4f..1ab2b234 100644 --- a/modules/po/block_motd.fr_FR.po +++ b/modules/po/block_motd.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 98ce85ea..1202e529 100644 --- a/modules/po/block_motd.id_ID.po +++ b/modules/po/block_motd.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d0f11a10..9bdd0b98 100644 --- a/modules/po/block_motd.it_IT.po +++ b/modules/po/block_motd.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/block_motd.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 2f9692c7..b5f45e34 100644 --- a/modules/po/block_motd.nl_NL.po +++ b/modules/po/block_motd.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/block_motd.pt_BR.po b/modules/po/block_motd.pt_BR.po index 65c9632d..cbc38077 100644 --- a/modules/po/block_motd.pt_BR.po +++ b/modules/po/block_motd.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8f0f2fde..3f2d08b7 100644 --- a/modules/po/block_motd.ru_RU.po +++ b/modules/po/block_motd.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/block_motd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 736ef6b2..238ea410 100644 --- a/modules/po/blockuser.bg_BG.po +++ b/modules/po/blockuser.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/blockuser.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/blockuser.de_DE.po b/modules/po/blockuser.de_DE.po index d09ac600..9ee66a49 100644 --- a/modules/po/blockuser.de_DE.po +++ b/modules/po/blockuser.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/blockuser.es_ES.po b/modules/po/blockuser.es_ES.po index 6d54106c..ac895618 100644 --- a/modules/po/blockuser.es_ES.po +++ b/modules/po/blockuser.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 68837ac0..4483cfac 100644 --- a/modules/po/blockuser.fr_FR.po +++ b/modules/po/blockuser.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 536ca1b5..8b4e9cef 100644 --- a/modules/po/blockuser.id_ID.po +++ b/modules/po/blockuser.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e998b590..7d8fa1d7 100644 --- a/modules/po/blockuser.it_IT.po +++ b/modules/po/blockuser.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/blockuser.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 391a6240..94413c9d 100644 --- a/modules/po/blockuser.nl_NL.po +++ b/modules/po/blockuser.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/blockuser.pt_BR.po b/modules/po/blockuser.pt_BR.po index 5125454c..112e96d5 100644 --- a/modules/po/blockuser.pt_BR.po +++ b/modules/po/blockuser.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c27debaf..2fddaf2f 100644 --- a/modules/po/blockuser.ru_RU.po +++ b/modules/po/blockuser.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/blockuser.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ed56dea9..419087de 100644 --- a/modules/po/bouncedcc.bg_BG.po +++ b/modules/po/bouncedcc.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/bouncedcc.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/bouncedcc.de_DE.po b/modules/po/bouncedcc.de_DE.po index 037a9231..31c89383 100644 --- a/modules/po/bouncedcc.de_DE.po +++ b/modules/po/bouncedcc.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/bouncedcc.es_ES.po b/modules/po/bouncedcc.es_ES.po index 572ee0dc..aa9dade7 100644 --- a/modules/po/bouncedcc.es_ES.po +++ b/modules/po/bouncedcc.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 58ff67de..6ad85549 100644 --- a/modules/po/bouncedcc.fr_FR.po +++ b/modules/po/bouncedcc.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 48080f6f..8ab2006e 100644 --- a/modules/po/bouncedcc.id_ID.po +++ b/modules/po/bouncedcc.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 3e5f7805..2b2b5aa6 100644 --- a/modules/po/bouncedcc.it_IT.po +++ b/modules/po/bouncedcc.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/bouncedcc.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 61705a30..2f40db3d 100644 --- a/modules/po/bouncedcc.nl_NL.po +++ b/modules/po/bouncedcc.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/bouncedcc.pt_BR.po b/modules/po/bouncedcc.pt_BR.po index ae171080..1e54ca68 100644 --- a/modules/po/bouncedcc.pt_BR.po +++ b/modules/po/bouncedcc.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 2b5a8343..6dfeb267 100644 --- a/modules/po/bouncedcc.ru_RU.po +++ b/modules/po/bouncedcc.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/bouncedcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 710ec01b..d87827f1 100644 --- a/modules/po/buffextras.bg_BG.po +++ b/modules/po/buffextras.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/buffextras.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/buffextras.de_DE.po b/modules/po/buffextras.de_DE.po index b23a3e6f..24f927ea 100644 --- a/modules/po/buffextras.de_DE.po +++ b/modules/po/buffextras.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/buffextras.es_ES.po b/modules/po/buffextras.es_ES.po index 660b820a..6db96d13 100644 --- a/modules/po/buffextras.es_ES.po +++ b/modules/po/buffextras.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c53c6da3..a60e05ff 100644 --- a/modules/po/buffextras.fr_FR.po +++ b/modules/po/buffextras.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 4a3f8d17..9c38a3ee 100644 --- a/modules/po/buffextras.id_ID.po +++ b/modules/po/buffextras.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0120ec42..c2be961d 100644 --- a/modules/po/buffextras.it_IT.po +++ b/modules/po/buffextras.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/buffextras.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c5161aca..6c9da941 100644 --- a/modules/po/buffextras.nl_NL.po +++ b/modules/po/buffextras.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/buffextras.pt_BR.po b/modules/po/buffextras.pt_BR.po index f1479629..bb7d927f 100644 --- a/modules/po/buffextras.pt_BR.po +++ b/modules/po/buffextras.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 3c490295..7cc2bd0e 100644 --- a/modules/po/buffextras.ru_RU.po +++ b/modules/po/buffextras.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/buffextras.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 61d4e9a1..2768764e 100644 --- a/modules/po/cert.bg_BG.po +++ b/modules/po/cert.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/cert.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/cert.de_DE.po b/modules/po/cert.de_DE.po index 1af9398e..ec158626 100644 --- a/modules/po/cert.de_DE.po +++ b/modules/po/cert.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/cert.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/cert.es_ES.po b/modules/po/cert.es_ES.po index 28505d4c..7369e3a5 100644 --- a/modules/po/cert.es_ES.po +++ b/modules/po/cert.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/cert.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 41dc56ea..dc024396 100644 --- a/modules/po/cert.fr_FR.po +++ b/modules/po/cert.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/cert.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 be00f6e3..c875fbfa 100644 --- a/modules/po/cert.id_ID.po +++ b/modules/po/cert.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/cert.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 10df78c9..beb953f4 100644 --- a/modules/po/cert.it_IT.po +++ b/modules/po/cert.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cert.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/cert.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 3567599c..f0154a12 100644 --- a/modules/po/cert.nl_NL.po +++ b/modules/po/cert.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/cert.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/cert.pt_BR.po b/modules/po/cert.pt_BR.po index 046239fe..207dee08 100644 --- a/modules/po/cert.pt_BR.po +++ b/modules/po/cert.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/cert.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 2064e16f..e4a6f6f6 100644 --- a/modules/po/cert.ru_RU.po +++ b/modules/po/cert.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/cert.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b419dbfd..d9e7df5b 100644 --- a/modules/po/certauth.bg_BG.po +++ b/modules/po/certauth.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/certauth.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -87,25 +81,16 @@ msgstr "" msgid "The key '{1}' is already added." msgstr "" -<<<<<<< HEAD #: certauth.cpp:170 certauth.cpp:183 -======= -#: certauth.cpp:170 certauth.cpp:182 ->>>>>>> 1.7.x msgctxt "list" msgid "Id" msgstr "" -<<<<<<< HEAD #: certauth.cpp:171 certauth.cpp:184 -======= -#: certauth.cpp:171 certauth.cpp:183 ->>>>>>> 1.7.x msgctxt "list" msgid "Key" msgstr "" -<<<<<<< HEAD #: certauth.cpp:176 certauth.cpp:190 certauth.cpp:199 msgid "No keys set for your user" msgstr "" @@ -119,20 +104,5 @@ msgid "Removed" msgstr "" #: certauth.cpp:291 -======= -#: certauth.cpp:175 certauth.cpp:189 certauth.cpp:198 -msgid "No keys set for your user" -msgstr "" - -#: certauth.cpp:203 -msgid "Invalid #, check \"list\"" -msgstr "" - -#: certauth.cpp:215 -msgid "Removed" -msgstr "" - -#: certauth.cpp:290 ->>>>>>> 1.7.x msgid "Allows users to authenticate via SSL client certificates." msgstr "" diff --git a/modules/po/certauth.de_DE.po b/modules/po/certauth.de_DE.po index 20598f39..f33d0c11 100644 --- a/modules/po/certauth.de_DE.po +++ b/modules/po/certauth.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/certauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/certauth.es_ES.po b/modules/po/certauth.es_ES.po index 34032d59..352efe1e 100644 --- a/modules/po/certauth.es_ES.po +++ b/modules/po/certauth.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/certauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 029e34f9..3d6cb2c6 100644 --- a/modules/po/certauth.fr_FR.po +++ b/modules/po/certauth.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/certauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 3b61f738..76938b2c 100644 --- a/modules/po/certauth.id_ID.po +++ b/modules/po/certauth.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/certauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 25d96ef3..a1b178a1 100644 --- a/modules/po/certauth.it_IT.po +++ b/modules/po/certauth.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/certauth.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/certauth.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Italian\n" "Language: it_IT\n" @@ -87,25 +81,16 @@ msgstr "" msgid "The key '{1}' is already added." msgstr "" -<<<<<<< HEAD #: certauth.cpp:170 certauth.cpp:183 -======= -#: certauth.cpp:170 certauth.cpp:182 ->>>>>>> 1.7.x msgctxt "list" msgid "Id" msgstr "" -<<<<<<< HEAD #: certauth.cpp:171 certauth.cpp:184 -======= -#: certauth.cpp:171 certauth.cpp:183 ->>>>>>> 1.7.x msgctxt "list" msgid "Key" msgstr "" -<<<<<<< HEAD #: certauth.cpp:176 certauth.cpp:190 certauth.cpp:199 msgid "No keys set for your user" msgstr "" @@ -119,20 +104,5 @@ msgid "Removed" msgstr "Rimosso" #: certauth.cpp:291 -======= -#: certauth.cpp:175 certauth.cpp:189 certauth.cpp:198 -msgid "No keys set for your user" -msgstr "" - -#: certauth.cpp:203 -msgid "Invalid #, check \"list\"" -msgstr "" - -#: certauth.cpp:215 -msgid "Removed" -msgstr "Rimosso" - -#: certauth.cpp:290 ->>>>>>> 1.7.x msgid "Allows users to authenticate via SSL client certificates." msgstr "" diff --git a/modules/po/certauth.nl_NL.po b/modules/po/certauth.nl_NL.po index 7a7bbaa5..26d8d6a7 100644 --- a/modules/po/certauth.nl_NL.po +++ b/modules/po/certauth.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/certauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/certauth.pt_BR.po b/modules/po/certauth.pt_BR.po index 2ecc45b5..232caddb 100644 --- a/modules/po/certauth.pt_BR.po +++ b/modules/po/certauth.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/certauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 63fe19ca..c3a3f786 100644 --- a/modules/po/certauth.ru_RU.po +++ b/modules/po/certauth.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/certauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 04ba01d3..490c356d 100644 --- a/modules/po/chansaver.bg_BG.po +++ b/modules/po/chansaver.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/chansaver.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/chansaver.de_DE.po b/modules/po/chansaver.de_DE.po index d36ea3eb..15de7e9b 100644 --- a/modules/po/chansaver.de_DE.po +++ b/modules/po/chansaver.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/chansaver.es_ES.po b/modules/po/chansaver.es_ES.po index bd60d68d..df725332 100644 --- a/modules/po/chansaver.es_ES.po +++ b/modules/po/chansaver.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 14b1af43..5456fcef 100644 --- a/modules/po/chansaver.fr_FR.po +++ b/modules/po/chansaver.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 3b0be13b..fdb9122c 100644 --- a/modules/po/chansaver.id_ID.po +++ b/modules/po/chansaver.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e42cbe4a..66b0e483 100644 --- a/modules/po/chansaver.it_IT.po +++ b/modules/po/chansaver.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/chansaver.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b4a551ad..f46b1c77 100644 --- a/modules/po/chansaver.nl_NL.po +++ b/modules/po/chansaver.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/chansaver.pt_BR.po b/modules/po/chansaver.pt_BR.po index af5f4dec..7dea4c23 100644 --- a/modules/po/chansaver.pt_BR.po +++ b/modules/po/chansaver.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 09e0453d..894d9668 100644 --- a/modules/po/chansaver.ru_RU.po +++ b/modules/po/chansaver.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/chansaver.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 55fcbe20..2cdcde1f 100644 --- a/modules/po/clearbufferonmsg.bg_BG.po +++ b/modules/po/clearbufferonmsg.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/clearbufferonmsg.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/clearbufferonmsg.de_DE.po b/modules/po/clearbufferonmsg.de_DE.po index d5e385df..e12da02c 100644 --- a/modules/po/clearbufferonmsg.de_DE.po +++ b/modules/po/clearbufferonmsg.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/clearbufferonmsg.es_ES.po b/modules/po/clearbufferonmsg.es_ES.po index 43566ad5..6301411b 100644 --- a/modules/po/clearbufferonmsg.es_ES.po +++ b/modules/po/clearbufferonmsg.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 7ebd44d1..ad523337 100644 --- a/modules/po/clearbufferonmsg.fr_FR.po +++ b/modules/po/clearbufferonmsg.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 a3664a09..4df9e183 100644 --- a/modules/po/clearbufferonmsg.id_ID.po +++ b/modules/po/clearbufferonmsg.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 733ce6d8..4bbcfbe6 100644 --- a/modules/po/clearbufferonmsg.it_IT.po +++ b/modules/po/clearbufferonmsg.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/clearbufferonmsg.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 531c8e20..d8547fec 100644 --- a/modules/po/clearbufferonmsg.nl_NL.po +++ b/modules/po/clearbufferonmsg.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/clearbufferonmsg.pt_BR.po b/modules/po/clearbufferonmsg.pt_BR.po index 3f5e61c5..23bfe4ef 100644 --- a/modules/po/clearbufferonmsg.pt_BR.po +++ b/modules/po/clearbufferonmsg.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 83a330a9..610d3f37 100644 --- a/modules/po/clearbufferonmsg.ru_RU.po +++ b/modules/po/clearbufferonmsg.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/clearbufferonmsg.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 67067341..4b6b54fd 100644 --- a/modules/po/clientnotify.bg_BG.po +++ b/modules/po/clientnotify.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/clientnotify.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/clientnotify.de_DE.po b/modules/po/clientnotify.de_DE.po index dadf3b8b..d2531af3 100644 --- a/modules/po/clientnotify.de_DE.po +++ b/modules/po/clientnotify.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/clientnotify.es_ES.po b/modules/po/clientnotify.es_ES.po index 6b3ae5a7..362eac07 100644 --- a/modules/po/clientnotify.es_ES.po +++ b/modules/po/clientnotify.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 bbbdbc8c..dab0b607 100644 --- a/modules/po/clientnotify.fr_FR.po +++ b/modules/po/clientnotify.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 054c7c4f..10bf81ef 100644 --- a/modules/po/clientnotify.id_ID.po +++ b/modules/po/clientnotify.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 723d78d2..9bfa1489 100644 --- a/modules/po/clientnotify.it_IT.po +++ b/modules/po/clientnotify.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/clientnotify.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 24590f7f..6940ef05 100644 --- a/modules/po/clientnotify.nl_NL.po +++ b/modules/po/clientnotify.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/clientnotify.pt_BR.po b/modules/po/clientnotify.pt_BR.po index 1bcbb43e..bcff83e4 100644 --- a/modules/po/clientnotify.pt_BR.po +++ b/modules/po/clientnotify.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8818bd29..f7b935f6 100644 --- a/modules/po/clientnotify.ru_RU.po +++ b/modules/po/clientnotify.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/clientnotify.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 35e0f190..6473c800 100644 --- a/modules/po/controlpanel.bg_BG.po +++ b/modules/po/controlpanel.bg_BG.po @@ -6,7 +6,6 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" @@ -14,29 +13,15 @@ msgstr "" "Language: bg_BG\n" #: controlpanel.cpp:51 controlpanel.cpp:64 -======= -"X-Crowdin-File: /1.7.x/modules/po/controlpanel.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" -"Language-Team: Bulgarian\n" -"Language: bg_BG\n" - -#: controlpanel.cpp:51 controlpanel.cpp:63 ->>>>>>> 1.7.x msgctxt "helptable" msgid "Type" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:52 controlpanel.cpp:66 -======= -#: controlpanel.cpp:52 controlpanel.cpp:65 ->>>>>>> 1.7.x msgctxt "helptable" msgid "Variables" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:78 msgid "String" msgstr "" @@ -58,55 +43,23 @@ msgid "The following variables are available when using the Set/Get commands:" msgstr "" #: controlpanel.cpp:149 -======= -#: controlpanel.cpp:77 -msgid "String" -msgstr "" - -#: controlpanel.cpp:78 -msgid "Boolean (true/false)" -msgstr "" - -#: controlpanel.cpp:79 -msgid "Integer" -msgstr "" - -#: controlpanel.cpp:80 -msgid "Number" -msgstr "" - -#: controlpanel.cpp:123 -msgid "The following variables are available when using the Set/Get commands:" -msgstr "" - -#: controlpanel.cpp:146 ->>>>>>> 1.7.x msgid "" "The following variables are available when using the SetNetwork/GetNetwork " "commands:" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:163 -======= -#: controlpanel.cpp:159 ->>>>>>> 1.7.x msgid "" "The following variables are available when using the SetChan/GetChan " "commands:" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:170 -======= -#: controlpanel.cpp:165 ->>>>>>> 1.7.x msgid "" "You can use $user as the user name and $network as the network name for " "modifying your own user and network." msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:179 controlpanel.cpp:966 controlpanel.cpp:1003 msgid "Error: User [{1}] does not exist!" msgstr "" @@ -199,105 +152,10 @@ msgid "Channel {1} for user {2} added to network {3}." msgstr "" #: controlpanel.cpp:692 -======= -#: controlpanel.cpp:174 controlpanel.cpp:961 controlpanel.cpp:998 -msgid "Error: User [{1}] does not exist!" -msgstr "" - -#: controlpanel.cpp:179 -msgid "Error: You need to have admin rights to modify other users!" -msgstr "" - -#: controlpanel.cpp:189 -msgid "Error: You cannot use $network to modify other users!" -msgstr "" - -#: controlpanel.cpp:197 -msgid "Error: User {1} does not have a network named [{2}]." -msgstr "" - -#: controlpanel.cpp:209 -msgid "Usage: Get [username]" -msgstr "" - -#: controlpanel.cpp:299 controlpanel.cpp:502 controlpanel.cpp:577 -#: controlpanel.cpp:653 controlpanel.cpp:788 controlpanel.cpp:873 -msgid "Error: Unknown variable" -msgstr "" - -#: controlpanel.cpp:308 -msgid "Usage: Set " -msgstr "" - -#: controlpanel.cpp:330 controlpanel.cpp:618 -msgid "This bind host is already set!" -msgstr "" - -#: controlpanel.cpp:337 controlpanel.cpp:349 controlpanel.cpp:357 -#: controlpanel.cpp:420 controlpanel.cpp:439 controlpanel.cpp:455 -#: controlpanel.cpp:465 controlpanel.cpp:625 -msgid "Access denied!" -msgstr "" - -#: controlpanel.cpp:371 controlpanel.cpp:380 controlpanel.cpp:837 -msgid "Setting failed, limit for buffer size is {1}" -msgstr "" - -#: controlpanel.cpp:400 -msgid "Password has been changed!" -msgstr "" - -#: controlpanel.cpp:408 -msgid "Timeout can't be less than 30 seconds!" -msgstr "" - -#: controlpanel.cpp:472 -msgid "That would be a bad idea!" -msgstr "" - -#: controlpanel.cpp:490 -msgid "Supported languages: {1}" -msgstr "" - -#: controlpanel.cpp:514 -msgid "Usage: GetNetwork [username] [network]" -msgstr "" - -#: controlpanel.cpp:533 -msgid "Error: A network must be specified to get another users settings." -msgstr "" - -#: controlpanel.cpp:539 -msgid "You are not currently attached to a network." -msgstr "" - -#: controlpanel.cpp:545 -msgid "Error: Invalid network." -msgstr "" - -#: controlpanel.cpp:589 -msgid "Usage: SetNetwork " -msgstr "" - -#: controlpanel.cpp:663 -msgid "Usage: AddChan " -msgstr "" - -#: controlpanel.cpp:676 -msgid "Error: User {1} already has a channel named {2}." -msgstr "" - -#: controlpanel.cpp:683 -msgid "Channel {1} for user {2} added to network {3}." -msgstr "" - -#: controlpanel.cpp:687 ->>>>>>> 1.7.x msgid "" "Could not add channel {1} for user {2} to network {3}, does it already exist?" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:702 msgid "Usage: DelChan " msgstr "" @@ -307,23 +165,11 @@ msgid "Error: User {1} does not have any channel matching [{2}] in network {3}" msgstr "" #: controlpanel.cpp:730 -======= -#: controlpanel.cpp:697 -msgid "Usage: DelChan " -msgstr "" - -#: controlpanel.cpp:712 -msgid "Error: User {1} does not have any channel matching [{2}] in network {3}" -msgstr "" - -#: controlpanel.cpp:725 ->>>>>>> 1.7.x msgid "Channel {1} is deleted from network {2} of user {3}" msgid_plural "Channels {1} are deleted from network {2} of user {3}" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: controlpanel.cpp:745 msgid "Usage: GetChan " msgstr "" @@ -337,80 +183,40 @@ msgid "Usage: SetChan " msgstr "" #: controlpanel.cpp:889 controlpanel.cpp:899 -======= -#: controlpanel.cpp:740 -msgid "Usage: GetChan " -msgstr "" - -#: controlpanel.cpp:754 controlpanel.cpp:818 -msgid "Error: No channels matching [{1}] found." -msgstr "" - -#: controlpanel.cpp:803 -msgid "Usage: SetChan " -msgstr "" - -#: controlpanel.cpp:884 controlpanel.cpp:894 ->>>>>>> 1.7.x msgctxt "listusers" msgid "Username" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:890 controlpanel.cpp:900 -======= -#: controlpanel.cpp:885 controlpanel.cpp:895 ->>>>>>> 1.7.x msgctxt "listusers" msgid "Realname" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:891 controlpanel.cpp:903 controlpanel.cpp:905 -======= -#: controlpanel.cpp:886 controlpanel.cpp:898 controlpanel.cpp:900 ->>>>>>> 1.7.x msgctxt "listusers" msgid "IsAdmin" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:892 controlpanel.cpp:906 -======= -#: controlpanel.cpp:887 controlpanel.cpp:901 ->>>>>>> 1.7.x msgctxt "listusers" msgid "Nick" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:893 controlpanel.cpp:907 -======= -#: controlpanel.cpp:888 controlpanel.cpp:902 ->>>>>>> 1.7.x msgctxt "listusers" msgid "AltNick" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:894 controlpanel.cpp:908 -======= -#: controlpanel.cpp:889 controlpanel.cpp:903 ->>>>>>> 1.7.x msgctxt "listusers" msgid "Ident" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:895 controlpanel.cpp:909 -======= -#: controlpanel.cpp:890 controlpanel.cpp:904 ->>>>>>> 1.7.x msgctxt "listusers" msgid "BindHost" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:903 controlpanel.cpp:1143 msgid "No" msgstr "" @@ -472,75 +278,11 @@ msgid "Usage: AddNetwork [user] network" msgstr "" #: controlpanel.cpp:1046 -======= -#: controlpanel.cpp:898 controlpanel.cpp:1138 -msgid "No" -msgstr "" - -#: controlpanel.cpp:900 controlpanel.cpp:1130 -msgid "Yes" -msgstr "" - -#: controlpanel.cpp:914 controlpanel.cpp:983 -msgid "Error: You need to have admin rights to add new users!" -msgstr "" - -#: controlpanel.cpp:920 -msgid "Usage: AddUser " -msgstr "" - -#: controlpanel.cpp:925 -msgid "Error: User {1} already exists!" -msgstr "" - -#: controlpanel.cpp:937 controlpanel.cpp:1012 -msgid "Error: User not added: {1}" -msgstr "" - -#: controlpanel.cpp:941 controlpanel.cpp:1016 -msgid "User {1} added!" -msgstr "" - -#: controlpanel.cpp:948 -msgid "Error: You need to have admin rights to delete users!" -msgstr "" - -#: controlpanel.cpp:954 -msgid "Usage: DelUser " -msgstr "" - -#: controlpanel.cpp:966 -msgid "Error: You can't delete yourself!" -msgstr "" - -#: controlpanel.cpp:972 -msgid "Error: Internal error!" -msgstr "" - -#: controlpanel.cpp:976 -msgid "User {1} deleted!" -msgstr "" - -#: controlpanel.cpp:991 -msgid "Usage: CloneUser " -msgstr "" - -#: controlpanel.cpp:1006 -msgid "Error: Cloning failed: {1}" -msgstr "" - -#: controlpanel.cpp:1035 -msgid "Usage: AddNetwork [user] network" -msgstr "" - -#: controlpanel.cpp:1041 ->>>>>>> 1.7.x msgid "" "Network number limit reached. Ask an admin to increase the limit for you, or " "delete unneeded networks using /znc DelNetwork " msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1054 msgid "Error: User {1} already has a network with the name {2}" msgstr "" @@ -570,78 +312,30 @@ msgid "Error: Network {1} could not be deleted for user {2}." msgstr "" #: controlpanel.cpp:1125 controlpanel.cpp:1133 -======= -#: controlpanel.cpp:1049 -msgid "Error: User {1} already has a network with the name {2}" -msgstr "" - -#: controlpanel.cpp:1056 -msgid "Network {1} added to user {2}." -msgstr "" - -#: controlpanel.cpp:1060 -msgid "Error: Network [{1}] could not be added for user {2}: {3}" -msgstr "" - -#: controlpanel.cpp:1080 -msgid "Usage: DelNetwork [user] network" -msgstr "" - -#: controlpanel.cpp:1091 -msgid "The currently active network can be deleted via {1}status" -msgstr "" - -#: controlpanel.cpp:1097 -msgid "Network {1} deleted for user {2}." -msgstr "" - -#: controlpanel.cpp:1101 -msgid "Error: Network {1} could not be deleted for user {2}." -msgstr "" - -#: controlpanel.cpp:1120 controlpanel.cpp:1128 ->>>>>>> 1.7.x msgctxt "listnetworks" msgid "Network" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1126 controlpanel.cpp:1135 controlpanel.cpp:1143 -======= -#: controlpanel.cpp:1121 controlpanel.cpp:1130 controlpanel.cpp:1138 ->>>>>>> 1.7.x msgctxt "listnetworks" msgid "OnIRC" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1127 controlpanel.cpp:1136 -======= -#: controlpanel.cpp:1122 controlpanel.cpp:1131 ->>>>>>> 1.7.x msgctxt "listnetworks" msgid "IRC Server" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1128 controlpanel.cpp:1138 -======= -#: controlpanel.cpp:1123 controlpanel.cpp:1133 ->>>>>>> 1.7.x msgctxt "listnetworks" msgid "IRC User" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1129 controlpanel.cpp:1140 -======= -#: controlpanel.cpp:1124 controlpanel.cpp:1135 ->>>>>>> 1.7.x msgctxt "listnetworks" msgid "Channels" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1148 msgid "No networks" msgstr "" @@ -687,67 +381,15 @@ msgid "Closed IRC connection for network {1} of user {2}." msgstr "" #: controlpanel.cpp:1285 controlpanel.cpp:1290 -======= -#: controlpanel.cpp:1143 -msgid "No networks" -msgstr "" - -#: controlpanel.cpp:1154 -msgid "Usage: AddServer [[+]port] [password]" -msgstr "" - -#: controlpanel.cpp:1168 -msgid "Added IRC Server {1} to network {2} for user {3}." -msgstr "" - -#: controlpanel.cpp:1172 -msgid "Error: Could not add IRC server {1} to network {2} for user {3}." -msgstr "" - -#: controlpanel.cpp:1185 -msgid "Usage: DelServer [[+]port] [password]" -msgstr "" - -#: controlpanel.cpp:1200 -msgid "Deleted IRC Server {1} from network {2} for user {3}." -msgstr "" - -#: controlpanel.cpp:1204 -msgid "Error: Could not delete IRC server {1} from network {2} for user {3}." -msgstr "" - -#: controlpanel.cpp:1214 -msgid "Usage: Reconnect " -msgstr "" - -#: controlpanel.cpp:1241 -msgid "Queued network {1} of user {2} for a reconnect." -msgstr "" - -#: controlpanel.cpp:1250 -msgid "Usage: Disconnect " -msgstr "" - -#: controlpanel.cpp:1265 -msgid "Closed IRC connection for network {1} of user {2}." -msgstr "" - -#: controlpanel.cpp:1280 controlpanel.cpp:1284 ->>>>>>> 1.7.x msgctxt "listctcp" msgid "Request" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1286 controlpanel.cpp:1291 -======= -#: controlpanel.cpp:1281 controlpanel.cpp:1285 ->>>>>>> 1.7.x msgctxt "listctcp" msgid "Reply" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1295 msgid "No CTCP replies for user {1} are configured" msgstr "" @@ -761,26 +403,10 @@ msgid "Usage: AddCTCP [user] [request] [reply]" msgstr "" #: controlpanel.cpp:1316 -======= -#: controlpanel.cpp:1289 -msgid "No CTCP replies for user {1} are configured" -msgstr "" - -#: controlpanel.cpp:1292 -msgid "CTCP replies for user {1}:" -msgstr "" - -#: controlpanel.cpp:1308 -msgid "Usage: AddCTCP [user] [request] [reply]" -msgstr "" - -#: controlpanel.cpp:1310 ->>>>>>> 1.7.x msgid "" "This will cause ZNC to reply to the CTCP instead of forwarding it to clients." msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1319 msgid "An empty reply will cause the CTCP request to be blocked." msgstr "" @@ -802,35 +428,11 @@ msgid "CTCP requests {1} to user {2} will now be sent to IRC clients" msgstr "" #: controlpanel.cpp:1359 -======= -#: controlpanel.cpp:1313 -msgid "An empty reply will cause the CTCP request to be blocked." -msgstr "" - -#: controlpanel.cpp:1322 -msgid "CTCP requests {1} to user {2} will now be blocked." -msgstr "" - -#: controlpanel.cpp:1326 -msgid "CTCP requests {1} to user {2} will now get reply: {3}" -msgstr "" - -#: controlpanel.cpp:1343 -msgid "Usage: DelCTCP [user] [request]" -msgstr "" - -#: controlpanel.cpp:1349 -msgid "CTCP requests {1} to user {2} will now be sent to IRC clients" -msgstr "" - -#: controlpanel.cpp:1353 ->>>>>>> 1.7.x msgid "" "CTCP requests {1} to user {2} will be sent to IRC clients (nothing has " "changed)" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1369 controlpanel.cpp:1443 msgid "Loading modules has been disabled." msgstr "" @@ -884,75 +486,15 @@ msgid "Usage: UnloadNetModule " msgstr "" #: controlpanel.cpp:1500 controlpanel.cpp:1506 -======= -#: controlpanel.cpp:1363 controlpanel.cpp:1437 -msgid "Loading modules has been disabled." -msgstr "" - -#: controlpanel.cpp:1372 -msgid "Error: Unable to load module {1}: {2}" -msgstr "" - -#: controlpanel.cpp:1375 -msgid "Loaded module {1}" -msgstr "" - -#: controlpanel.cpp:1380 -msgid "Error: Unable to reload module {1}: {2}" -msgstr "" - -#: controlpanel.cpp:1383 -msgid "Reloaded module {1}" -msgstr "" - -#: controlpanel.cpp:1387 -msgid "Error: Unable to load module {1} because it is already loaded" -msgstr "" - -#: controlpanel.cpp:1398 -msgid "Usage: LoadModule [args]" -msgstr "" - -#: controlpanel.cpp:1417 -msgid "Usage: LoadNetModule [args]" -msgstr "" - -#: controlpanel.cpp:1442 -msgid "Please use /znc unloadmod {1}" -msgstr "" - -#: controlpanel.cpp:1448 -msgid "Error: Unable to unload module {1}: {2}" -msgstr "" - -#: controlpanel.cpp:1451 -msgid "Unloaded module {1}" -msgstr "" - -#: controlpanel.cpp:1460 -msgid "Usage: UnloadModule " -msgstr "" - -#: controlpanel.cpp:1477 -msgid "Usage: UnloadNetModule " -msgstr "" - -#: controlpanel.cpp:1494 controlpanel.cpp:1499 ->>>>>>> 1.7.x msgctxt "listmodules" msgid "Name" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1501 controlpanel.cpp:1507 -======= -#: controlpanel.cpp:1495 controlpanel.cpp:1500 ->>>>>>> 1.7.x msgctxt "listmodules" msgid "Arguments" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1526 msgid "User {1} has no modules loaded." msgstr "" @@ -1170,225 +712,6 @@ msgid "List all networks for a user" msgstr "" #: controlpanel.cpp:1664 -======= -#: controlpanel.cpp:1519 -msgid "User {1} has no modules loaded." -msgstr "" - -#: controlpanel.cpp:1523 -msgid "Modules loaded for user {1}:" -msgstr "" - -#: controlpanel.cpp:1543 -msgid "Network {1} of user {2} has no modules loaded." -msgstr "" - -#: controlpanel.cpp:1548 -msgid "Modules loaded for network {1} of user {2}:" -msgstr "" - -#: controlpanel.cpp:1555 -msgid "[command] [variable]" -msgstr "" - -#: controlpanel.cpp:1556 -msgid "Prints help for matching commands and variables" -msgstr "" - -#: controlpanel.cpp:1559 -msgid " [username]" -msgstr "" - -#: controlpanel.cpp:1560 -msgid "Prints the variable's value for the given or current user" -msgstr "" - -#: controlpanel.cpp:1562 -msgid " " -msgstr "" - -#: controlpanel.cpp:1563 -msgid "Sets the variable's value for the given user" -msgstr "" - -#: controlpanel.cpp:1565 -msgid " [username] [network]" -msgstr "" - -#: controlpanel.cpp:1566 -msgid "Prints the variable's value for the given network" -msgstr "" - -#: controlpanel.cpp:1568 -msgid " " -msgstr "" - -#: controlpanel.cpp:1569 -msgid "Sets the variable's value for the given network" -msgstr "" - -#: controlpanel.cpp:1571 -msgid " [username] " -msgstr "" - -#: controlpanel.cpp:1572 -msgid "Prints the variable's value for the given channel" -msgstr "" - -#: controlpanel.cpp:1575 -msgid " " -msgstr "" - -#: controlpanel.cpp:1576 -msgid "Sets the variable's value for the given channel" -msgstr "" - -#: controlpanel.cpp:1578 controlpanel.cpp:1581 -msgid " " -msgstr "" - -#: controlpanel.cpp:1579 -msgid "Adds a new channel" -msgstr "" - -#: controlpanel.cpp:1582 -msgid "Deletes a channel" -msgstr "" - -#: controlpanel.cpp:1584 -msgid "Lists users" -msgstr "" - -#: controlpanel.cpp:1586 -msgid " " -msgstr "" - -#: controlpanel.cpp:1587 -msgid "Adds a new user" -msgstr "" - -#: controlpanel.cpp:1589 controlpanel.cpp:1612 controlpanel.cpp:1626 -msgid "" -msgstr "" - -#: controlpanel.cpp:1589 -msgid "Deletes a user" -msgstr "" - -#: controlpanel.cpp:1591 -msgid " " -msgstr "" - -#: controlpanel.cpp:1592 -msgid "Clones a user" -msgstr "" - -#: controlpanel.cpp:1594 controlpanel.cpp:1597 -msgid " " -msgstr "" - -#: controlpanel.cpp:1595 -msgid "Adds a new IRC server for the given or current user" -msgstr "" - -#: controlpanel.cpp:1598 -msgid "Deletes an IRC server from the given or current user" -msgstr "" - -#: controlpanel.cpp:1600 controlpanel.cpp:1603 controlpanel.cpp:1623 -msgid " " -msgstr "" - -#: controlpanel.cpp:1601 -msgid "Cycles the user's IRC server connection" -msgstr "" - -#: controlpanel.cpp:1604 -msgid "Disconnects the user from their IRC server" -msgstr "" - -#: controlpanel.cpp:1606 -msgid " [args]" -msgstr "" - -#: controlpanel.cpp:1607 -msgid "Loads a Module for a user" -msgstr "" - -#: controlpanel.cpp:1609 -msgid " " -msgstr "" - -#: controlpanel.cpp:1610 -msgid "Removes a Module of a user" -msgstr "" - -#: controlpanel.cpp:1613 -msgid "Get the list of modules for a user" -msgstr "" - -#: controlpanel.cpp:1616 -msgid " [args]" -msgstr "" - -#: controlpanel.cpp:1617 -msgid "Loads a Module for a network" -msgstr "" - -#: controlpanel.cpp:1620 -msgid " " -msgstr "" - -#: controlpanel.cpp:1621 -msgid "Removes a Module of a network" -msgstr "" - -#: controlpanel.cpp:1624 -msgid "Get the list of modules for a network" -msgstr "" - -#: controlpanel.cpp:1627 -msgid "List the configured CTCP replies" -msgstr "" - -#: controlpanel.cpp:1629 -msgid " [reply]" -msgstr "" - -#: controlpanel.cpp:1630 -msgid "Configure a new CTCP reply" -msgstr "" - -#: controlpanel.cpp:1632 -msgid " " -msgstr "" - -#: controlpanel.cpp:1633 -msgid "Remove a CTCP reply" -msgstr "" - -#: controlpanel.cpp:1637 controlpanel.cpp:1640 -msgid "[username] " -msgstr "" - -#: controlpanel.cpp:1638 -msgid "Add a network for a user" -msgstr "" - -#: controlpanel.cpp:1641 -msgid "Delete a network for a user" -msgstr "" - -#: controlpanel.cpp:1643 -msgid "[username]" -msgstr "" - -#: controlpanel.cpp:1644 -msgid "List all networks for a user" -msgstr "" - -#: controlpanel.cpp:1657 ->>>>>>> 1.7.x msgid "" "Dynamic configuration through IRC. Allows editing only yourself if you're " "not ZNC admin." diff --git a/modules/po/controlpanel.de_DE.po b/modules/po/controlpanel.de_DE.po index 039d82ed..99fc41d7 100644 --- a/modules/po/controlpanel.de_DE.po +++ b/modules/po/controlpanel.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/controlpanel.es_ES.po b/modules/po/controlpanel.es_ES.po index 4ff4e95d..3b9081c3 100644 --- a/modules/po/controlpanel.es_ES.po +++ b/modules/po/controlpanel.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 24d51808..785be51c 100644 --- a/modules/po/controlpanel.fr_FR.po +++ b/modules/po/controlpanel.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 cf853b64..65a57d41 100644 --- a/modules/po/controlpanel.id_ID.po +++ b/modules/po/controlpanel.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 28f7be7f..b4ffd2de 100644 --- a/modules/po/controlpanel.it_IT.po +++ b/modules/po/controlpanel.it_IT.po @@ -6,7 +6,6 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" @@ -14,29 +13,15 @@ msgstr "" "Language: it_IT\n" #: controlpanel.cpp:51 controlpanel.cpp:64 -======= -"X-Crowdin-File: /1.7.x/modules/po/controlpanel.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" -"Language-Team: Italian\n" -"Language: it_IT\n" - -#: controlpanel.cpp:51 controlpanel.cpp:63 ->>>>>>> 1.7.x msgctxt "helptable" msgid "Type" msgstr "Tipo" -<<<<<<< HEAD #: controlpanel.cpp:52 controlpanel.cpp:66 -======= -#: controlpanel.cpp:52 controlpanel.cpp:65 ->>>>>>> 1.7.x msgctxt "helptable" msgid "Variables" msgstr "Variabili" -<<<<<<< HEAD #: controlpanel.cpp:78 msgid "String" msgstr "Stringa" @@ -58,55 +43,23 @@ msgid "The following variables are available when using the Set/Get commands:" msgstr "" #: controlpanel.cpp:149 -======= -#: controlpanel.cpp:77 -msgid "String" -msgstr "Stringa" - -#: controlpanel.cpp:78 -msgid "Boolean (true/false)" -msgstr "Boolean (vero / falso)" - -#: controlpanel.cpp:79 -msgid "Integer" -msgstr "Numero intero" - -#: controlpanel.cpp:80 -msgid "Number" -msgstr "Numero" - -#: controlpanel.cpp:123 -msgid "The following variables are available when using the Set/Get commands:" -msgstr "" - -#: controlpanel.cpp:146 ->>>>>>> 1.7.x msgid "" "The following variables are available when using the SetNetwork/GetNetwork " "commands:" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:163 -======= -#: controlpanel.cpp:159 ->>>>>>> 1.7.x msgid "" "The following variables are available when using the SetChan/GetChan " "commands:" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:170 -======= -#: controlpanel.cpp:165 ->>>>>>> 1.7.x msgid "" "You can use $user as the user name and $network as the network name for " "modifying your own user and network." msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:179 controlpanel.cpp:966 controlpanel.cpp:1003 msgid "Error: User [{1}] does not exist!" msgstr "" @@ -199,105 +152,10 @@ msgid "Channel {1} for user {2} added to network {3}." msgstr "" #: controlpanel.cpp:692 -======= -#: controlpanel.cpp:174 controlpanel.cpp:961 controlpanel.cpp:998 -msgid "Error: User [{1}] does not exist!" -msgstr "" - -#: controlpanel.cpp:179 -msgid "Error: You need to have admin rights to modify other users!" -msgstr "" - -#: controlpanel.cpp:189 -msgid "Error: You cannot use $network to modify other users!" -msgstr "" - -#: controlpanel.cpp:197 -msgid "Error: User {1} does not have a network named [{2}]." -msgstr "" - -#: controlpanel.cpp:209 -msgid "Usage: Get [username]" -msgstr "" - -#: controlpanel.cpp:299 controlpanel.cpp:502 controlpanel.cpp:577 -#: controlpanel.cpp:653 controlpanel.cpp:788 controlpanel.cpp:873 -msgid "Error: Unknown variable" -msgstr "" - -#: controlpanel.cpp:308 -msgid "Usage: Set " -msgstr "" - -#: controlpanel.cpp:330 controlpanel.cpp:618 -msgid "This bind host is already set!" -msgstr "" - -#: controlpanel.cpp:337 controlpanel.cpp:349 controlpanel.cpp:357 -#: controlpanel.cpp:420 controlpanel.cpp:439 controlpanel.cpp:455 -#: controlpanel.cpp:465 controlpanel.cpp:625 -msgid "Access denied!" -msgstr "" - -#: controlpanel.cpp:371 controlpanel.cpp:380 controlpanel.cpp:837 -msgid "Setting failed, limit for buffer size is {1}" -msgstr "" - -#: controlpanel.cpp:400 -msgid "Password has been changed!" -msgstr "" - -#: controlpanel.cpp:408 -msgid "Timeout can't be less than 30 seconds!" -msgstr "" - -#: controlpanel.cpp:472 -msgid "That would be a bad idea!" -msgstr "" - -#: controlpanel.cpp:490 -msgid "Supported languages: {1}" -msgstr "" - -#: controlpanel.cpp:514 -msgid "Usage: GetNetwork [username] [network]" -msgstr "" - -#: controlpanel.cpp:533 -msgid "Error: A network must be specified to get another users settings." -msgstr "" - -#: controlpanel.cpp:539 -msgid "You are not currently attached to a network." -msgstr "" - -#: controlpanel.cpp:545 -msgid "Error: Invalid network." -msgstr "" - -#: controlpanel.cpp:589 -msgid "Usage: SetNetwork " -msgstr "" - -#: controlpanel.cpp:663 -msgid "Usage: AddChan " -msgstr "" - -#: controlpanel.cpp:676 -msgid "Error: User {1} already has a channel named {2}." -msgstr "" - -#: controlpanel.cpp:683 -msgid "Channel {1} for user {2} added to network {3}." -msgstr "" - -#: controlpanel.cpp:687 ->>>>>>> 1.7.x msgid "" "Could not add channel {1} for user {2} to network {3}, does it already exist?" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:702 msgid "Usage: DelChan " msgstr "" @@ -307,23 +165,11 @@ msgid "Error: User {1} does not have any channel matching [{2}] in network {3}" msgstr "" #: controlpanel.cpp:730 -======= -#: controlpanel.cpp:697 -msgid "Usage: DelChan " -msgstr "" - -#: controlpanel.cpp:712 -msgid "Error: User {1} does not have any channel matching [{2}] in network {3}" -msgstr "" - -#: controlpanel.cpp:725 ->>>>>>> 1.7.x msgid "Channel {1} is deleted from network {2} of user {3}" msgid_plural "Channels {1} are deleted from network {2} of user {3}" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: controlpanel.cpp:745 msgid "Usage: GetChan " msgstr "" @@ -337,80 +183,40 @@ msgid "Usage: SetChan " msgstr "" #: controlpanel.cpp:889 controlpanel.cpp:899 -======= -#: controlpanel.cpp:740 -msgid "Usage: GetChan " -msgstr "" - -#: controlpanel.cpp:754 controlpanel.cpp:818 -msgid "Error: No channels matching [{1}] found." -msgstr "" - -#: controlpanel.cpp:803 -msgid "Usage: SetChan " -msgstr "" - -#: controlpanel.cpp:884 controlpanel.cpp:894 ->>>>>>> 1.7.x msgctxt "listusers" msgid "Username" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:890 controlpanel.cpp:900 -======= -#: controlpanel.cpp:885 controlpanel.cpp:895 ->>>>>>> 1.7.x msgctxt "listusers" msgid "Realname" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:891 controlpanel.cpp:903 controlpanel.cpp:905 -======= -#: controlpanel.cpp:886 controlpanel.cpp:898 controlpanel.cpp:900 ->>>>>>> 1.7.x msgctxt "listusers" msgid "IsAdmin" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:892 controlpanel.cpp:906 -======= -#: controlpanel.cpp:887 controlpanel.cpp:901 ->>>>>>> 1.7.x msgctxt "listusers" msgid "Nick" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:893 controlpanel.cpp:907 -======= -#: controlpanel.cpp:888 controlpanel.cpp:902 ->>>>>>> 1.7.x msgctxt "listusers" msgid "AltNick" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:894 controlpanel.cpp:908 -======= -#: controlpanel.cpp:889 controlpanel.cpp:903 ->>>>>>> 1.7.x msgctxt "listusers" msgid "Ident" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:895 controlpanel.cpp:909 -======= -#: controlpanel.cpp:890 controlpanel.cpp:904 ->>>>>>> 1.7.x msgctxt "listusers" msgid "BindHost" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:903 controlpanel.cpp:1143 msgid "No" msgstr "" @@ -472,75 +278,11 @@ msgid "Usage: AddNetwork [user] network" msgstr "" #: controlpanel.cpp:1046 -======= -#: controlpanel.cpp:898 controlpanel.cpp:1138 -msgid "No" -msgstr "" - -#: controlpanel.cpp:900 controlpanel.cpp:1130 -msgid "Yes" -msgstr "" - -#: controlpanel.cpp:914 controlpanel.cpp:983 -msgid "Error: You need to have admin rights to add new users!" -msgstr "" - -#: controlpanel.cpp:920 -msgid "Usage: AddUser " -msgstr "" - -#: controlpanel.cpp:925 -msgid "Error: User {1} already exists!" -msgstr "" - -#: controlpanel.cpp:937 controlpanel.cpp:1012 -msgid "Error: User not added: {1}" -msgstr "" - -#: controlpanel.cpp:941 controlpanel.cpp:1016 -msgid "User {1} added!" -msgstr "" - -#: controlpanel.cpp:948 -msgid "Error: You need to have admin rights to delete users!" -msgstr "" - -#: controlpanel.cpp:954 -msgid "Usage: DelUser " -msgstr "" - -#: controlpanel.cpp:966 -msgid "Error: You can't delete yourself!" -msgstr "" - -#: controlpanel.cpp:972 -msgid "Error: Internal error!" -msgstr "" - -#: controlpanel.cpp:976 -msgid "User {1} deleted!" -msgstr "" - -#: controlpanel.cpp:991 -msgid "Usage: CloneUser " -msgstr "" - -#: controlpanel.cpp:1006 -msgid "Error: Cloning failed: {1}" -msgstr "" - -#: controlpanel.cpp:1035 -msgid "Usage: AddNetwork [user] network" -msgstr "" - -#: controlpanel.cpp:1041 ->>>>>>> 1.7.x msgid "" "Network number limit reached. Ask an admin to increase the limit for you, or " "delete unneeded networks using /znc DelNetwork " msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1054 msgid "Error: User {1} already has a network with the name {2}" msgstr "" @@ -570,78 +312,30 @@ msgid "Error: Network {1} could not be deleted for user {2}." msgstr "" #: controlpanel.cpp:1125 controlpanel.cpp:1133 -======= -#: controlpanel.cpp:1049 -msgid "Error: User {1} already has a network with the name {2}" -msgstr "" - -#: controlpanel.cpp:1056 -msgid "Network {1} added to user {2}." -msgstr "" - -#: controlpanel.cpp:1060 -msgid "Error: Network [{1}] could not be added for user {2}: {3}" -msgstr "" - -#: controlpanel.cpp:1080 -msgid "Usage: DelNetwork [user] network" -msgstr "" - -#: controlpanel.cpp:1091 -msgid "The currently active network can be deleted via {1}status" -msgstr "" - -#: controlpanel.cpp:1097 -msgid "Network {1} deleted for user {2}." -msgstr "" - -#: controlpanel.cpp:1101 -msgid "Error: Network {1} could not be deleted for user {2}." -msgstr "" - -#: controlpanel.cpp:1120 controlpanel.cpp:1128 ->>>>>>> 1.7.x msgctxt "listnetworks" msgid "Network" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1126 controlpanel.cpp:1135 controlpanel.cpp:1143 -======= -#: controlpanel.cpp:1121 controlpanel.cpp:1130 controlpanel.cpp:1138 ->>>>>>> 1.7.x msgctxt "listnetworks" msgid "OnIRC" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1127 controlpanel.cpp:1136 -======= -#: controlpanel.cpp:1122 controlpanel.cpp:1131 ->>>>>>> 1.7.x msgctxt "listnetworks" msgid "IRC Server" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1128 controlpanel.cpp:1138 -======= -#: controlpanel.cpp:1123 controlpanel.cpp:1133 ->>>>>>> 1.7.x msgctxt "listnetworks" msgid "IRC User" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1129 controlpanel.cpp:1140 -======= -#: controlpanel.cpp:1124 controlpanel.cpp:1135 ->>>>>>> 1.7.x msgctxt "listnetworks" msgid "Channels" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1148 msgid "No networks" msgstr "" @@ -687,67 +381,15 @@ msgid "Closed IRC connection for network {1} of user {2}." msgstr "" #: controlpanel.cpp:1285 controlpanel.cpp:1290 -======= -#: controlpanel.cpp:1143 -msgid "No networks" -msgstr "" - -#: controlpanel.cpp:1154 -msgid "Usage: AddServer [[+]port] [password]" -msgstr "" - -#: controlpanel.cpp:1168 -msgid "Added IRC Server {1} to network {2} for user {3}." -msgstr "" - -#: controlpanel.cpp:1172 -msgid "Error: Could not add IRC server {1} to network {2} for user {3}." -msgstr "" - -#: controlpanel.cpp:1185 -msgid "Usage: DelServer [[+]port] [password]" -msgstr "" - -#: controlpanel.cpp:1200 -msgid "Deleted IRC Server {1} from network {2} for user {3}." -msgstr "" - -#: controlpanel.cpp:1204 -msgid "Error: Could not delete IRC server {1} from network {2} for user {3}." -msgstr "" - -#: controlpanel.cpp:1214 -msgid "Usage: Reconnect " -msgstr "" - -#: controlpanel.cpp:1241 -msgid "Queued network {1} of user {2} for a reconnect." -msgstr "" - -#: controlpanel.cpp:1250 -msgid "Usage: Disconnect " -msgstr "" - -#: controlpanel.cpp:1265 -msgid "Closed IRC connection for network {1} of user {2}." -msgstr "" - -#: controlpanel.cpp:1280 controlpanel.cpp:1284 ->>>>>>> 1.7.x msgctxt "listctcp" msgid "Request" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1286 controlpanel.cpp:1291 -======= -#: controlpanel.cpp:1281 controlpanel.cpp:1285 ->>>>>>> 1.7.x msgctxt "listctcp" msgid "Reply" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1295 msgid "No CTCP replies for user {1} are configured" msgstr "" @@ -761,26 +403,10 @@ msgid "Usage: AddCTCP [user] [request] [reply]" msgstr "" #: controlpanel.cpp:1316 -======= -#: controlpanel.cpp:1289 -msgid "No CTCP replies for user {1} are configured" -msgstr "" - -#: controlpanel.cpp:1292 -msgid "CTCP replies for user {1}:" -msgstr "" - -#: controlpanel.cpp:1308 -msgid "Usage: AddCTCP [user] [request] [reply]" -msgstr "" - -#: controlpanel.cpp:1310 ->>>>>>> 1.7.x msgid "" "This will cause ZNC to reply to the CTCP instead of forwarding it to clients." msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1319 msgid "An empty reply will cause the CTCP request to be blocked." msgstr "" @@ -802,35 +428,11 @@ msgid "CTCP requests {1} to user {2} will now be sent to IRC clients" msgstr "" #: controlpanel.cpp:1359 -======= -#: controlpanel.cpp:1313 -msgid "An empty reply will cause the CTCP request to be blocked." -msgstr "" - -#: controlpanel.cpp:1322 -msgid "CTCP requests {1} to user {2} will now be blocked." -msgstr "" - -#: controlpanel.cpp:1326 -msgid "CTCP requests {1} to user {2} will now get reply: {3}" -msgstr "" - -#: controlpanel.cpp:1343 -msgid "Usage: DelCTCP [user] [request]" -msgstr "" - -#: controlpanel.cpp:1349 -msgid "CTCP requests {1} to user {2} will now be sent to IRC clients" -msgstr "" - -#: controlpanel.cpp:1353 ->>>>>>> 1.7.x msgid "" "CTCP requests {1} to user {2} will be sent to IRC clients (nothing has " "changed)" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1369 controlpanel.cpp:1443 msgid "Loading modules has been disabled." msgstr "" @@ -884,75 +486,15 @@ msgid "Usage: UnloadNetModule " msgstr "" #: controlpanel.cpp:1500 controlpanel.cpp:1506 -======= -#: controlpanel.cpp:1363 controlpanel.cpp:1437 -msgid "Loading modules has been disabled." -msgstr "" - -#: controlpanel.cpp:1372 -msgid "Error: Unable to load module {1}: {2}" -msgstr "" - -#: controlpanel.cpp:1375 -msgid "Loaded module {1}" -msgstr "" - -#: controlpanel.cpp:1380 -msgid "Error: Unable to reload module {1}: {2}" -msgstr "" - -#: controlpanel.cpp:1383 -msgid "Reloaded module {1}" -msgstr "" - -#: controlpanel.cpp:1387 -msgid "Error: Unable to load module {1} because it is already loaded" -msgstr "" - -#: controlpanel.cpp:1398 -msgid "Usage: LoadModule [args]" -msgstr "" - -#: controlpanel.cpp:1417 -msgid "Usage: LoadNetModule [args]" -msgstr "" - -#: controlpanel.cpp:1442 -msgid "Please use /znc unloadmod {1}" -msgstr "" - -#: controlpanel.cpp:1448 -msgid "Error: Unable to unload module {1}: {2}" -msgstr "" - -#: controlpanel.cpp:1451 -msgid "Unloaded module {1}" -msgstr "" - -#: controlpanel.cpp:1460 -msgid "Usage: UnloadModule " -msgstr "" - -#: controlpanel.cpp:1477 -msgid "Usage: UnloadNetModule " -msgstr "" - -#: controlpanel.cpp:1494 controlpanel.cpp:1499 ->>>>>>> 1.7.x msgctxt "listmodules" msgid "Name" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1501 controlpanel.cpp:1507 -======= -#: controlpanel.cpp:1495 controlpanel.cpp:1500 ->>>>>>> 1.7.x msgctxt "listmodules" msgid "Arguments" msgstr "" -<<<<<<< HEAD #: controlpanel.cpp:1526 msgid "User {1} has no modules loaded." msgstr "" @@ -1170,225 +712,6 @@ msgid "List all networks for a user" msgstr "" #: controlpanel.cpp:1664 -======= -#: controlpanel.cpp:1519 -msgid "User {1} has no modules loaded." -msgstr "" - -#: controlpanel.cpp:1523 -msgid "Modules loaded for user {1}:" -msgstr "" - -#: controlpanel.cpp:1543 -msgid "Network {1} of user {2} has no modules loaded." -msgstr "" - -#: controlpanel.cpp:1548 -msgid "Modules loaded for network {1} of user {2}:" -msgstr "" - -#: controlpanel.cpp:1555 -msgid "[command] [variable]" -msgstr "" - -#: controlpanel.cpp:1556 -msgid "Prints help for matching commands and variables" -msgstr "" - -#: controlpanel.cpp:1559 -msgid " [username]" -msgstr "" - -#: controlpanel.cpp:1560 -msgid "Prints the variable's value for the given or current user" -msgstr "" - -#: controlpanel.cpp:1562 -msgid " " -msgstr "" - -#: controlpanel.cpp:1563 -msgid "Sets the variable's value for the given user" -msgstr "" - -#: controlpanel.cpp:1565 -msgid " [username] [network]" -msgstr "" - -#: controlpanel.cpp:1566 -msgid "Prints the variable's value for the given network" -msgstr "" - -#: controlpanel.cpp:1568 -msgid " " -msgstr "" - -#: controlpanel.cpp:1569 -msgid "Sets the variable's value for the given network" -msgstr "" - -#: controlpanel.cpp:1571 -msgid " [username] " -msgstr "" - -#: controlpanel.cpp:1572 -msgid "Prints the variable's value for the given channel" -msgstr "" - -#: controlpanel.cpp:1575 -msgid " " -msgstr "" - -#: controlpanel.cpp:1576 -msgid "Sets the variable's value for the given channel" -msgstr "" - -#: controlpanel.cpp:1578 controlpanel.cpp:1581 -msgid " " -msgstr "" - -#: controlpanel.cpp:1579 -msgid "Adds a new channel" -msgstr "" - -#: controlpanel.cpp:1582 -msgid "Deletes a channel" -msgstr "" - -#: controlpanel.cpp:1584 -msgid "Lists users" -msgstr "" - -#: controlpanel.cpp:1586 -msgid " " -msgstr "" - -#: controlpanel.cpp:1587 -msgid "Adds a new user" -msgstr "" - -#: controlpanel.cpp:1589 controlpanel.cpp:1612 controlpanel.cpp:1626 -msgid "" -msgstr "" - -#: controlpanel.cpp:1589 -msgid "Deletes a user" -msgstr "" - -#: controlpanel.cpp:1591 -msgid " " -msgstr "" - -#: controlpanel.cpp:1592 -msgid "Clones a user" -msgstr "" - -#: controlpanel.cpp:1594 controlpanel.cpp:1597 -msgid " " -msgstr "" - -#: controlpanel.cpp:1595 -msgid "Adds a new IRC server for the given or current user" -msgstr "" - -#: controlpanel.cpp:1598 -msgid "Deletes an IRC server from the given or current user" -msgstr "" - -#: controlpanel.cpp:1600 controlpanel.cpp:1603 controlpanel.cpp:1623 -msgid " " -msgstr "" - -#: controlpanel.cpp:1601 -msgid "Cycles the user's IRC server connection" -msgstr "" - -#: controlpanel.cpp:1604 -msgid "Disconnects the user from their IRC server" -msgstr "" - -#: controlpanel.cpp:1606 -msgid " [args]" -msgstr "" - -#: controlpanel.cpp:1607 -msgid "Loads a Module for a user" -msgstr "" - -#: controlpanel.cpp:1609 -msgid " " -msgstr "" - -#: controlpanel.cpp:1610 -msgid "Removes a Module of a user" -msgstr "" - -#: controlpanel.cpp:1613 -msgid "Get the list of modules for a user" -msgstr "" - -#: controlpanel.cpp:1616 -msgid " [args]" -msgstr "" - -#: controlpanel.cpp:1617 -msgid "Loads a Module for a network" -msgstr "" - -#: controlpanel.cpp:1620 -msgid " " -msgstr "" - -#: controlpanel.cpp:1621 -msgid "Removes a Module of a network" -msgstr "" - -#: controlpanel.cpp:1624 -msgid "Get the list of modules for a network" -msgstr "" - -#: controlpanel.cpp:1627 -msgid "List the configured CTCP replies" -msgstr "" - -#: controlpanel.cpp:1629 -msgid " [reply]" -msgstr "" - -#: controlpanel.cpp:1630 -msgid "Configure a new CTCP reply" -msgstr "" - -#: controlpanel.cpp:1632 -msgid " " -msgstr "" - -#: controlpanel.cpp:1633 -msgid "Remove a CTCP reply" -msgstr "" - -#: controlpanel.cpp:1637 controlpanel.cpp:1640 -msgid "[username] " -msgstr "" - -#: controlpanel.cpp:1638 -msgid "Add a network for a user" -msgstr "" - -#: controlpanel.cpp:1641 -msgid "Delete a network for a user" -msgstr "" - -#: controlpanel.cpp:1643 -msgid "[username]" -msgstr "" - -#: controlpanel.cpp:1644 -msgid "List all networks for a user" -msgstr "" - -#: controlpanel.cpp:1657 ->>>>>>> 1.7.x msgid "" "Dynamic configuration through IRC. Allows editing only yourself if you're " "not ZNC admin." diff --git a/modules/po/controlpanel.nl_NL.po b/modules/po/controlpanel.nl_NL.po index 32085203..d2325971 100644 --- a/modules/po/controlpanel.nl_NL.po +++ b/modules/po/controlpanel.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/controlpanel.pt_BR.po b/modules/po/controlpanel.pt_BR.po index ed81040b..c6a61c42 100644 --- a/modules/po/controlpanel.pt_BR.po +++ b/modules/po/controlpanel.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 cfdbb810..95789e1b 100644 --- a/modules/po/controlpanel.ru_RU.po +++ b/modules/po/controlpanel.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/controlpanel.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 aa225925..f5e889d8 100644 --- a/modules/po/crypt.bg_BG.po +++ b/modules/po/crypt.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/crypt.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -130,36 +124,20 @@ msgstr "" msgid "Setting Nick Prefix to {1}" msgstr "" -<<<<<<< HEAD #: crypt.cpp:474 crypt.cpp:481 -======= -#: crypt.cpp:474 crypt.cpp:480 ->>>>>>> 1.7.x msgctxt "listkeys" msgid "Target" msgstr "" -<<<<<<< HEAD #: crypt.cpp:475 crypt.cpp:482 -======= -#: crypt.cpp:475 crypt.cpp:481 ->>>>>>> 1.7.x msgctxt "listkeys" msgid "Key" msgstr "" -<<<<<<< HEAD #: crypt.cpp:486 msgid "You have no encryption keys set." msgstr "" #: crypt.cpp:508 -======= -#: crypt.cpp:485 -msgid "You have no encryption keys set." -msgstr "" - -#: crypt.cpp:507 ->>>>>>> 1.7.x msgid "Encryption for channel/private messages" msgstr "" diff --git a/modules/po/crypt.de_DE.po b/modules/po/crypt.de_DE.po index e641e60e..d16955b1 100644 --- a/modules/po/crypt.de_DE.po +++ b/modules/po/crypt.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/crypt.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/crypt.es_ES.po b/modules/po/crypt.es_ES.po index d5873108..0c67cd6c 100644 --- a/modules/po/crypt.es_ES.po +++ b/modules/po/crypt.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/crypt.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 43269cf4..7d86683f 100644 --- a/modules/po/crypt.fr_FR.po +++ b/modules/po/crypt.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/crypt.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8ffacd61..2daac836 100644 --- a/modules/po/crypt.id_ID.po +++ b/modules/po/crypt.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/crypt.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 212a5979..8c6d9140 100644 --- a/modules/po/crypt.it_IT.po +++ b/modules/po/crypt.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/crypt.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/crypt.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Italian\n" "Language: it_IT\n" @@ -130,36 +124,20 @@ msgstr "" msgid "Setting Nick Prefix to {1}" msgstr "" -<<<<<<< HEAD #: crypt.cpp:474 crypt.cpp:481 -======= -#: crypt.cpp:474 crypt.cpp:480 ->>>>>>> 1.7.x msgctxt "listkeys" msgid "Target" msgstr "" -<<<<<<< HEAD #: crypt.cpp:475 crypt.cpp:482 -======= -#: crypt.cpp:475 crypt.cpp:481 ->>>>>>> 1.7.x msgctxt "listkeys" msgid "Key" msgstr "" -<<<<<<< HEAD #: crypt.cpp:486 msgid "You have no encryption keys set." msgstr "" #: crypt.cpp:508 -======= -#: crypt.cpp:485 -msgid "You have no encryption keys set." -msgstr "" - -#: crypt.cpp:507 ->>>>>>> 1.7.x msgid "Encryption for channel/private messages" msgstr "" diff --git a/modules/po/crypt.nl_NL.po b/modules/po/crypt.nl_NL.po index ad884aab..bdb32aca 100644 --- a/modules/po/crypt.nl_NL.po +++ b/modules/po/crypt.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/crypt.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/crypt.pt_BR.po b/modules/po/crypt.pt_BR.po index e4383d1e..2b93cbfb 100644 --- a/modules/po/crypt.pt_BR.po +++ b/modules/po/crypt.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/crypt.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 fc0d8a40..5d1f5f3c 100644 --- a/modules/po/crypt.ru_RU.po +++ b/modules/po/crypt.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/crypt.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 7e48c2f7..4598217a 100644 --- a/modules/po/ctcpflood.bg_BG.po +++ b/modules/po/ctcpflood.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/ctcpflood.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/ctcpflood.de_DE.po b/modules/po/ctcpflood.de_DE.po index 0ce668ba..e08c9e3d 100644 --- a/modules/po/ctcpflood.de_DE.po +++ b/modules/po/ctcpflood.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/ctcpflood.es_ES.po b/modules/po/ctcpflood.es_ES.po index a28e9775..3f13d550 100644 --- a/modules/po/ctcpflood.es_ES.po +++ b/modules/po/ctcpflood.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 795616b5..4566fbaf 100644 --- a/modules/po/ctcpflood.fr_FR.po +++ b/modules/po/ctcpflood.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 1a1aaa56..952d4d2a 100644 --- a/modules/po/ctcpflood.id_ID.po +++ b/modules/po/ctcpflood.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 825344cb..d6aa33d6 100644 --- a/modules/po/ctcpflood.it_IT.po +++ b/modules/po/ctcpflood.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/ctcpflood.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 3bc78a7f..11ba1692 100644 --- a/modules/po/ctcpflood.nl_NL.po +++ b/modules/po/ctcpflood.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/ctcpflood.pt_BR.po b/modules/po/ctcpflood.pt_BR.po index 1163e29d..6761947d 100644 --- a/modules/po/ctcpflood.pt_BR.po +++ b/modules/po/ctcpflood.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 85839210..bb6e6295 100644 --- a/modules/po/ctcpflood.ru_RU.po +++ b/modules/po/ctcpflood.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/ctcpflood.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f31a28e0..a3b4869f 100644 --- a/modules/po/cyrusauth.bg_BG.po +++ b/modules/po/cyrusauth.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/cyrusauth.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/cyrusauth.de_DE.po b/modules/po/cyrusauth.de_DE.po index aa892816..14a0845e 100644 --- a/modules/po/cyrusauth.de_DE.po +++ b/modules/po/cyrusauth.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/cyrusauth.es_ES.po b/modules/po/cyrusauth.es_ES.po index 192293a0..a66d1003 100644 --- a/modules/po/cyrusauth.es_ES.po +++ b/modules/po/cyrusauth.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 56d6200a..d34fa100 100644 --- a/modules/po/cyrusauth.fr_FR.po +++ b/modules/po/cyrusauth.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 654b82f0..612b26ee 100644 --- a/modules/po/cyrusauth.id_ID.po +++ b/modules/po/cyrusauth.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 1b6f091a..807cb2e7 100644 --- a/modules/po/cyrusauth.it_IT.po +++ b/modules/po/cyrusauth.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/cyrusauth.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 27097251..9b9bc329 100644 --- a/modules/po/cyrusauth.nl_NL.po +++ b/modules/po/cyrusauth.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/cyrusauth.pt_BR.po b/modules/po/cyrusauth.pt_BR.po index c3a27eaa..61a93c9b 100644 --- a/modules/po/cyrusauth.pt_BR.po +++ b/modules/po/cyrusauth.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d9dc2166..a30b1014 100644 --- a/modules/po/cyrusauth.ru_RU.po +++ b/modules/po/cyrusauth.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/cyrusauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b449294f..e96cf350 100644 --- a/modules/po/dcc.bg_BG.po +++ b/modules/po/dcc.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/dcc.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/dcc.de_DE.po b/modules/po/dcc.de_DE.po index bd798dd2..7d260073 100644 --- a/modules/po/dcc.de_DE.po +++ b/modules/po/dcc.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/dcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/dcc.es_ES.po b/modules/po/dcc.es_ES.po index 6c915a1c..258ecf09 100644 --- a/modules/po/dcc.es_ES.po +++ b/modules/po/dcc.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/dcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8bd0c82b..65e69647 100644 --- a/modules/po/dcc.fr_FR.po +++ b/modules/po/dcc.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/dcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0c53f146..655be7f1 100644 --- a/modules/po/dcc.id_ID.po +++ b/modules/po/dcc.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/dcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e6daa93e..b2443cc6 100644 --- a/modules/po/dcc.it_IT.po +++ b/modules/po/dcc.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/dcc.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/dcc.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 bba6a0e8..971c5530 100644 --- a/modules/po/dcc.nl_NL.po +++ b/modules/po/dcc.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/dcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/dcc.pt_BR.po b/modules/po/dcc.pt_BR.po index 9721a7c2..b70b8696 100644 --- a/modules/po/dcc.pt_BR.po +++ b/modules/po/dcc.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/dcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 9df886d9..60095a68 100644 --- a/modules/po/dcc.ru_RU.po +++ b/modules/po/dcc.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/dcc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 118e0673..1b68505d 100644 --- a/modules/po/disconkick.bg_BG.po +++ b/modules/po/disconkick.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/disconkick.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/disconkick.de_DE.po b/modules/po/disconkick.de_DE.po index 9f58b8f8..704a13e7 100644 --- a/modules/po/disconkick.de_DE.po +++ b/modules/po/disconkick.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/disconkick.es_ES.po b/modules/po/disconkick.es_ES.po index 76f8092b..bfbad97e 100644 --- a/modules/po/disconkick.es_ES.po +++ b/modules/po/disconkick.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 9b1e3f56..46e322e8 100644 --- a/modules/po/disconkick.fr_FR.po +++ b/modules/po/disconkick.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 62df3b4b..875b0eb1 100644 --- a/modules/po/disconkick.id_ID.po +++ b/modules/po/disconkick.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b6aec038..e128c59b 100644 --- a/modules/po/disconkick.it_IT.po +++ b/modules/po/disconkick.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/disconkick.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 facac481..a39376ab 100644 --- a/modules/po/disconkick.nl_NL.po +++ b/modules/po/disconkick.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/disconkick.pt_BR.po b/modules/po/disconkick.pt_BR.po index 81ede5b8..52eb3498 100644 --- a/modules/po/disconkick.pt_BR.po +++ b/modules/po/disconkick.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 11ff9b0f..ebd4e8e6 100644 --- a/modules/po/disconkick.ru_RU.po +++ b/modules/po/disconkick.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/disconkick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 3a119a6d..d47ebd9c 100644 --- a/modules/po/fail2ban.bg_BG.po +++ b/modules/po/fail2ban.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/fail2ban.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -97,47 +91,27 @@ msgstr "" msgid "Ignored: {1}" msgstr "" -<<<<<<< HEAD #: fail2ban.cpp:177 fail2ban.cpp:183 -======= -#: fail2ban.cpp:177 fail2ban.cpp:182 ->>>>>>> 1.7.x msgctxt "list" msgid "Host" msgstr "" -<<<<<<< HEAD #: fail2ban.cpp:178 fail2ban.cpp:184 -======= -#: fail2ban.cpp:178 fail2ban.cpp:183 ->>>>>>> 1.7.x msgctxt "list" msgid "Attempts" msgstr "" -<<<<<<< HEAD #: fail2ban.cpp:188 -======= -#: fail2ban.cpp:187 ->>>>>>> 1.7.x msgctxt "list" msgid "No bans" msgstr "" -<<<<<<< HEAD #: fail2ban.cpp:245 -======= -#: fail2ban.cpp:244 ->>>>>>> 1.7.x msgid "" "You might enter the time in minutes for the IP banning and the number of " "failed logins before any action is taken." msgstr "" -<<<<<<< HEAD #: fail2ban.cpp:250 -======= -#: fail2ban.cpp:249 ->>>>>>> 1.7.x msgid "Block IPs for some time after a failed login." msgstr "" diff --git a/modules/po/fail2ban.de_DE.po b/modules/po/fail2ban.de_DE.po index 261d1c98..ba1ac4f5 100644 --- a/modules/po/fail2ban.de_DE.po +++ b/modules/po/fail2ban.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/fail2ban.es_ES.po b/modules/po/fail2ban.es_ES.po index 5e9d3b78..391dd15e 100644 --- a/modules/po/fail2ban.es_ES.po +++ b/modules/po/fail2ban.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e228cd40..d2d20040 100644 --- a/modules/po/fail2ban.fr_FR.po +++ b/modules/po/fail2ban.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 faf48efb..c4e2eaba 100644 --- a/modules/po/fail2ban.id_ID.po +++ b/modules/po/fail2ban.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 389af2f5..512afe05 100644 --- a/modules/po/fail2ban.it_IT.po +++ b/modules/po/fail2ban.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/fail2ban.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Italian\n" "Language: it_IT\n" @@ -97,47 +91,27 @@ msgstr "" msgid "Ignored: {1}" msgstr "" -<<<<<<< HEAD #: fail2ban.cpp:177 fail2ban.cpp:183 -======= -#: fail2ban.cpp:177 fail2ban.cpp:182 ->>>>>>> 1.7.x msgctxt "list" msgid "Host" msgstr "" -<<<<<<< HEAD #: fail2ban.cpp:178 fail2ban.cpp:184 -======= -#: fail2ban.cpp:178 fail2ban.cpp:183 ->>>>>>> 1.7.x msgctxt "list" msgid "Attempts" msgstr "" -<<<<<<< HEAD #: fail2ban.cpp:188 -======= -#: fail2ban.cpp:187 ->>>>>>> 1.7.x msgctxt "list" msgid "No bans" msgstr "" -<<<<<<< HEAD #: fail2ban.cpp:245 -======= -#: fail2ban.cpp:244 ->>>>>>> 1.7.x msgid "" "You might enter the time in minutes for the IP banning and the number of " "failed logins before any action is taken." msgstr "" -<<<<<<< HEAD #: fail2ban.cpp:250 -======= -#: fail2ban.cpp:249 ->>>>>>> 1.7.x msgid "Block IPs for some time after a failed login." msgstr "" diff --git a/modules/po/fail2ban.nl_NL.po b/modules/po/fail2ban.nl_NL.po index e5ff37e4..04861bd8 100644 --- a/modules/po/fail2ban.nl_NL.po +++ b/modules/po/fail2ban.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/fail2ban.pt_BR.po b/modules/po/fail2ban.pt_BR.po index 82470d21..fbd5c36d 100644 --- a/modules/po/fail2ban.pt_BR.po +++ b/modules/po/fail2ban.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 08357ea6..a2a6b647 100644 --- a/modules/po/fail2ban.ru_RU.po +++ b/modules/po/fail2ban.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/fail2ban.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 6e4c37fd..d699c6fd 100644 --- a/modules/po/flooddetach.bg_BG.po +++ b/modules/po/flooddetach.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/flooddetach.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/flooddetach.de_DE.po b/modules/po/flooddetach.de_DE.po index 15755eea..ba6aa473 100644 --- a/modules/po/flooddetach.de_DE.po +++ b/modules/po/flooddetach.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/flooddetach.es_ES.po b/modules/po/flooddetach.es_ES.po index 889149f2..a7a57b4e 100644 --- a/modules/po/flooddetach.es_ES.po +++ b/modules/po/flooddetach.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e9f032b7..287466f4 100644 --- a/modules/po/flooddetach.fr_FR.po +++ b/modules/po/flooddetach.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 7738d1b6..adcedbf6 100644 --- a/modules/po/flooddetach.id_ID.po +++ b/modules/po/flooddetach.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f86ce406..40a98d60 100644 --- a/modules/po/flooddetach.it_IT.po +++ b/modules/po/flooddetach.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/flooddetach.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 75105acc..f3f67921 100644 --- a/modules/po/flooddetach.nl_NL.po +++ b/modules/po/flooddetach.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/flooddetach.pt_BR.po b/modules/po/flooddetach.pt_BR.po index b8c44bd8..ea93da1b 100644 --- a/modules/po/flooddetach.pt_BR.po +++ b/modules/po/flooddetach.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 3aa8e1d2..851f1c50 100644 --- a/modules/po/flooddetach.ru_RU.po +++ b/modules/po/flooddetach.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/flooddetach.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b5949d0a..ed64c929 100644 --- a/modules/po/identfile.bg_BG.po +++ b/modules/po/identfile.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/identfile.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/identfile.de_DE.po b/modules/po/identfile.de_DE.po index 41f38276..bb58273a 100644 --- a/modules/po/identfile.de_DE.po +++ b/modules/po/identfile.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/identfile.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/identfile.es_ES.po b/modules/po/identfile.es_ES.po index 158c1fa2..5966719d 100644 --- a/modules/po/identfile.es_ES.po +++ b/modules/po/identfile.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/identfile.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 1122a879..f9369f2c 100644 --- a/modules/po/identfile.fr_FR.po +++ b/modules/po/identfile.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/identfile.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c1b4bba3..7d770d25 100644 --- a/modules/po/identfile.id_ID.po +++ b/modules/po/identfile.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/identfile.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 a81a79ae..ca8cf3b1 100644 --- a/modules/po/identfile.it_IT.po +++ b/modules/po/identfile.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/identfile.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/identfile.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 46af5c48..58071354 100644 --- a/modules/po/identfile.nl_NL.po +++ b/modules/po/identfile.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/identfile.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/identfile.pt_BR.po b/modules/po/identfile.pt_BR.po index 3f3d285d..dca39204 100644 --- a/modules/po/identfile.pt_BR.po +++ b/modules/po/identfile.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/identfile.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b154cb48..f88ecc08 100644 --- a/modules/po/identfile.ru_RU.po +++ b/modules/po/identfile.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/identfile.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 91320f05..8df800a1 100644 --- a/modules/po/imapauth.bg_BG.po +++ b/modules/po/imapauth.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/imapauth.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/imapauth.de_DE.po b/modules/po/imapauth.de_DE.po index 4e0e68b2..10ee95de 100644 --- a/modules/po/imapauth.de_DE.po +++ b/modules/po/imapauth.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/imapauth.es_ES.po b/modules/po/imapauth.es_ES.po index d7cb808a..fc601ce8 100644 --- a/modules/po/imapauth.es_ES.po +++ b/modules/po/imapauth.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 2fcfa61f..d54ccc66 100644 --- a/modules/po/imapauth.fr_FR.po +++ b/modules/po/imapauth.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 2e0e0392..55d21c41 100644 --- a/modules/po/imapauth.id_ID.po +++ b/modules/po/imapauth.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 43d763f7..4d7864f0 100644 --- a/modules/po/imapauth.it_IT.po +++ b/modules/po/imapauth.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/imapauth.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e588cfe1..9a3a6308 100644 --- a/modules/po/imapauth.nl_NL.po +++ b/modules/po/imapauth.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/imapauth.pt_BR.po b/modules/po/imapauth.pt_BR.po index 7636f7bd..73bb976d 100644 --- a/modules/po/imapauth.pt_BR.po +++ b/modules/po/imapauth.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 49bebc0b..14e19730 100644 --- a/modules/po/imapauth.ru_RU.po +++ b/modules/po/imapauth.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/imapauth.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ccdae429..642ebc0e 100644 --- a/modules/po/keepnick.bg_BG.po +++ b/modules/po/keepnick.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/keepnick.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/keepnick.de_DE.po b/modules/po/keepnick.de_DE.po index 1faf22dc..9c416f50 100644 --- a/modules/po/keepnick.de_DE.po +++ b/modules/po/keepnick.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/keepnick.es_ES.po b/modules/po/keepnick.es_ES.po index 748286d3..3d15390c 100644 --- a/modules/po/keepnick.es_ES.po +++ b/modules/po/keepnick.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 a5750ee0..3e0f9127 100644 --- a/modules/po/keepnick.fr_FR.po +++ b/modules/po/keepnick.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ffdac758..2aad9f59 100644 --- a/modules/po/keepnick.id_ID.po +++ b/modules/po/keepnick.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ed56795a..72aa59ea 100644 --- a/modules/po/keepnick.it_IT.po +++ b/modules/po/keepnick.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/keepnick.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 355f2f68..d72b0f9c 100644 --- a/modules/po/keepnick.nl_NL.po +++ b/modules/po/keepnick.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/keepnick.pt_BR.po b/modules/po/keepnick.pt_BR.po index 26bdc1f1..a5d54830 100644 --- a/modules/po/keepnick.pt_BR.po +++ b/modules/po/keepnick.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 3d41e9a4..3b564f60 100644 --- a/modules/po/keepnick.ru_RU.po +++ b/modules/po/keepnick.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/keepnick.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 4d526931..0455692f 100644 --- a/modules/po/kickrejoin.bg_BG.po +++ b/modules/po/kickrejoin.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/kickrejoin.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/kickrejoin.de_DE.po b/modules/po/kickrejoin.de_DE.po index 1a985445..9ef6b7ea 100644 --- a/modules/po/kickrejoin.de_DE.po +++ b/modules/po/kickrejoin.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/kickrejoin.es_ES.po b/modules/po/kickrejoin.es_ES.po index 6331da00..cbacfeb9 100644 --- a/modules/po/kickrejoin.es_ES.po +++ b/modules/po/kickrejoin.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8be03ec2..84d66e55 100644 --- a/modules/po/kickrejoin.fr_FR.po +++ b/modules/po/kickrejoin.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b82d7acf..a2f91880 100644 --- a/modules/po/kickrejoin.id_ID.po +++ b/modules/po/kickrejoin.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f6321fb5..f1c4215c 100644 --- a/modules/po/kickrejoin.it_IT.po +++ b/modules/po/kickrejoin.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/kickrejoin.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 a934559c..abaf844f 100644 --- a/modules/po/kickrejoin.nl_NL.po +++ b/modules/po/kickrejoin.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/kickrejoin.pt_BR.po b/modules/po/kickrejoin.pt_BR.po index 8fecc6a8..06ba6315 100644 --- a/modules/po/kickrejoin.pt_BR.po +++ b/modules/po/kickrejoin.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b6c25fb5..05b285bc 100644 --- a/modules/po/kickrejoin.ru_RU.po +++ b/modules/po/kickrejoin.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/kickrejoin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 489378c3..59b8700f 100644 --- a/modules/po/lastseen.bg_BG.po +++ b/modules/po/lastseen.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/lastseen.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -22,11 +16,7 @@ msgstr "" msgid "User" msgstr "" -<<<<<<< HEAD #: modules/po/../data/lastseen/tmpl/index.tmpl:9 lastseen.cpp:99 -======= -#: modules/po/../data/lastseen/tmpl/index.tmpl:9 lastseen.cpp:98 ->>>>>>> 1.7.x msgid "Last Seen" msgstr "" @@ -54,25 +44,16 @@ msgstr "" msgid "Access denied" msgstr "" -<<<<<<< HEAD #: lastseen.cpp:61 lastseen.cpp:67 -======= -#: lastseen.cpp:61 lastseen.cpp:66 ->>>>>>> 1.7.x msgctxt "show" msgid "User" msgstr "" -<<<<<<< HEAD #: lastseen.cpp:62 lastseen.cpp:68 -======= -#: lastseen.cpp:62 lastseen.cpp:67 ->>>>>>> 1.7.x msgctxt "show" msgid "Last Seen" msgstr "" -<<<<<<< HEAD #: lastseen.cpp:69 lastseen.cpp:125 msgid "never" msgstr "" @@ -82,16 +63,5 @@ msgid "Shows list of users and when they last logged in" msgstr "" #: lastseen.cpp:154 -======= -#: lastseen.cpp:68 lastseen.cpp:124 -msgid "never" -msgstr "" - -#: lastseen.cpp:78 -msgid "Shows list of users and when they last logged in" -msgstr "" - -#: lastseen.cpp:153 ->>>>>>> 1.7.x msgid "Collects data about when a user last logged in." msgstr "" diff --git a/modules/po/lastseen.de_DE.po b/modules/po/lastseen.de_DE.po index 1e724139..ddc6a82e 100644 --- a/modules/po/lastseen.de_DE.po +++ b/modules/po/lastseen.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/lastseen.es_ES.po b/modules/po/lastseen.es_ES.po index 677af061..df803807 100644 --- a/modules/po/lastseen.es_ES.po +++ b/modules/po/lastseen.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d58e2f2c..24204078 100644 --- a/modules/po/lastseen.fr_FR.po +++ b/modules/po/lastseen.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 aadb874f..e6c98188 100644 --- a/modules/po/lastseen.id_ID.po +++ b/modules/po/lastseen.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 beafd9ee..5212e764 100644 --- a/modules/po/lastseen.it_IT.po +++ b/modules/po/lastseen.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/lastseen.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Italian\n" "Language: it_IT\n" @@ -22,11 +16,7 @@ msgstr "" msgid "User" msgstr "" -<<<<<<< HEAD #: modules/po/../data/lastseen/tmpl/index.tmpl:9 lastseen.cpp:99 -======= -#: modules/po/../data/lastseen/tmpl/index.tmpl:9 lastseen.cpp:98 ->>>>>>> 1.7.x msgid "Last Seen" msgstr "" @@ -54,25 +44,16 @@ msgstr "" msgid "Access denied" msgstr "" -<<<<<<< HEAD #: lastseen.cpp:61 lastseen.cpp:67 -======= -#: lastseen.cpp:61 lastseen.cpp:66 ->>>>>>> 1.7.x msgctxt "show" msgid "User" msgstr "" -<<<<<<< HEAD #: lastseen.cpp:62 lastseen.cpp:68 -======= -#: lastseen.cpp:62 lastseen.cpp:67 ->>>>>>> 1.7.x msgctxt "show" msgid "Last Seen" msgstr "" -<<<<<<< HEAD #: lastseen.cpp:69 lastseen.cpp:125 msgid "never" msgstr "" @@ -82,16 +63,5 @@ msgid "Shows list of users and when they last logged in" msgstr "" #: lastseen.cpp:154 -======= -#: lastseen.cpp:68 lastseen.cpp:124 -msgid "never" -msgstr "" - -#: lastseen.cpp:78 -msgid "Shows list of users and when they last logged in" -msgstr "" - -#: lastseen.cpp:153 ->>>>>>> 1.7.x msgid "Collects data about when a user last logged in." msgstr "" diff --git a/modules/po/lastseen.nl_NL.po b/modules/po/lastseen.nl_NL.po index 17a6bd7b..275738c5 100644 --- a/modules/po/lastseen.nl_NL.po +++ b/modules/po/lastseen.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/lastseen.pt_BR.po b/modules/po/lastseen.pt_BR.po index e69366e6..095ce971 100644 --- a/modules/po/lastseen.pt_BR.po +++ b/modules/po/lastseen.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 22b674fd..03ffb2d2 100644 --- a/modules/po/lastseen.ru_RU.po +++ b/modules/po/lastseen.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/lastseen.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e3e5a53d..54472c3a 100644 --- a/modules/po/listsockets.bg_BG.po +++ b/modules/po/listsockets.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/listsockets.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/listsockets.de_DE.po b/modules/po/listsockets.de_DE.po index 971f64dc..60b6a469 100644 --- a/modules/po/listsockets.de_DE.po +++ b/modules/po/listsockets.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/listsockets.es_ES.po b/modules/po/listsockets.es_ES.po index bb457fed..7e2011d6 100644 --- a/modules/po/listsockets.es_ES.po +++ b/modules/po/listsockets.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d7596f43..f006ed1c 100644 --- a/modules/po/listsockets.fr_FR.po +++ b/modules/po/listsockets.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 608c0107..e1fe1af8 100644 --- a/modules/po/listsockets.id_ID.po +++ b/modules/po/listsockets.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 7185fe40..58a3a18b 100644 --- a/modules/po/listsockets.it_IT.po +++ b/modules/po/listsockets.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/listsockets.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b8cb474d..e3b0634b 100644 --- a/modules/po/listsockets.nl_NL.po +++ b/modules/po/listsockets.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/listsockets.pt_BR.po b/modules/po/listsockets.pt_BR.po index 8f4d1d3f..a25ed589 100644 --- a/modules/po/listsockets.pt_BR.po +++ b/modules/po/listsockets.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 917cd0cc..8b0904c5 100644 --- a/modules/po/listsockets.ru_RU.po +++ b/modules/po/listsockets.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/listsockets.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 dfc7e5f6..d6b6a645 100644 --- a/modules/po/log.bg_BG.po +++ b/modules/po/log.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/log.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -54,11 +48,7 @@ msgstr "" msgid "Wildcards are allowed" msgstr "" -<<<<<<< HEAD #: log.cpp:156 log.cpp:179 -======= -#: log.cpp:156 log.cpp:178 ->>>>>>> 1.7.x msgid "No logging rules. Everything is logged." msgstr "" @@ -68,34 +58,21 @@ msgid_plural "{1} rules removed: {2}" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: log.cpp:168 log.cpp:174 -======= -#: log.cpp:168 log.cpp:173 ->>>>>>> 1.7.x msgctxt "listrules" msgid "Rule" msgstr "" -<<<<<<< HEAD #: log.cpp:169 log.cpp:175 -======= -#: log.cpp:169 log.cpp:174 ->>>>>>> 1.7.x msgctxt "listrules" msgid "Logging enabled" msgstr "" -<<<<<<< HEAD #: log.cpp:190 -======= -#: log.cpp:189 ->>>>>>> 1.7.x msgid "" "Usage: Set true|false, where is one of: joins, quits, nickchanges" msgstr "" -<<<<<<< HEAD #: log.cpp:197 msgid "Will log joins" msgstr "" @@ -149,67 +126,11 @@ msgid "Not logging nick changes" msgstr "" #: log.cpp:352 -======= -#: log.cpp:196 -msgid "Will log joins" -msgstr "" - -#: log.cpp:196 -msgid "Will not log joins" -msgstr "" - -#: log.cpp:197 -msgid "Will log quits" -msgstr "" - -#: log.cpp:197 -msgid "Will not log quits" -msgstr "" - -#: log.cpp:199 -msgid "Will log nick changes" -msgstr "" - -#: log.cpp:199 -msgid "Will not log nick changes" -msgstr "" - -#: log.cpp:203 -msgid "Unknown variable. Known variables: joins, quits, nickchanges" -msgstr "" - -#: log.cpp:211 -msgid "Logging joins" -msgstr "" - -#: log.cpp:211 -msgid "Not logging joins" -msgstr "" - -#: log.cpp:212 -msgid "Logging quits" -msgstr "" - -#: log.cpp:212 -msgid "Not logging quits" -msgstr "" - -#: log.cpp:213 -msgid "Logging nick changes" -msgstr "" - -#: log.cpp:214 -msgid "Not logging nick changes" -msgstr "" - -#: log.cpp:351 ->>>>>>> 1.7.x msgid "" "Invalid args [{1}]. Only one log path allowed. Check that there are no " "spaces in the path." msgstr "" -<<<<<<< HEAD #: log.cpp:402 msgid "Invalid log path [{1}]" msgstr "" @@ -223,20 +144,5 @@ msgid "[-sanitize] Optional path where to store logs." msgstr "" #: log.cpp:564 -======= -#: log.cpp:401 -msgid "Invalid log path [{1}]" -msgstr "" - -#: log.cpp:404 -msgid "Logging to [{1}]. Using timestamp format '{2}'" -msgstr "" - -#: log.cpp:559 -msgid "[-sanitize] Optional path where to store logs." -msgstr "" - -#: log.cpp:563 ->>>>>>> 1.7.x msgid "Writes IRC logs." msgstr "" diff --git a/modules/po/log.de_DE.po b/modules/po/log.de_DE.po index 0d1a74b1..6d119424 100644 --- a/modules/po/log.de_DE.po +++ b/modules/po/log.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/log.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/log.es_ES.po b/modules/po/log.es_ES.po index cbfb9031..00a4f780 100644 --- a/modules/po/log.es_ES.po +++ b/modules/po/log.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/log.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f3da6256..b65b2748 100644 --- a/modules/po/log.fr_FR.po +++ b/modules/po/log.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/log.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ad034acc..ee95fc67 100644 --- a/modules/po/log.id_ID.po +++ b/modules/po/log.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/log.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8435b63a..f4099ac0 100644 --- a/modules/po/log.it_IT.po +++ b/modules/po/log.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/log.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/log.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Italian\n" "Language: it_IT\n" @@ -54,11 +48,7 @@ msgstr "" msgid "Wildcards are allowed" msgstr "" -<<<<<<< HEAD #: log.cpp:156 log.cpp:179 -======= -#: log.cpp:156 log.cpp:178 ->>>>>>> 1.7.x msgid "No logging rules. Everything is logged." msgstr "" @@ -68,34 +58,21 @@ msgid_plural "{1} rules removed: {2}" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: log.cpp:168 log.cpp:174 -======= -#: log.cpp:168 log.cpp:173 ->>>>>>> 1.7.x msgctxt "listrules" msgid "Rule" msgstr "" -<<<<<<< HEAD #: log.cpp:169 log.cpp:175 -======= -#: log.cpp:169 log.cpp:174 ->>>>>>> 1.7.x msgctxt "listrules" msgid "Logging enabled" msgstr "" -<<<<<<< HEAD #: log.cpp:190 -======= -#: log.cpp:189 ->>>>>>> 1.7.x msgid "" "Usage: Set true|false, where is one of: joins, quits, nickchanges" msgstr "" -<<<<<<< HEAD #: log.cpp:197 msgid "Will log joins" msgstr "" @@ -149,67 +126,11 @@ msgid "Not logging nick changes" msgstr "" #: log.cpp:352 -======= -#: log.cpp:196 -msgid "Will log joins" -msgstr "" - -#: log.cpp:196 -msgid "Will not log joins" -msgstr "" - -#: log.cpp:197 -msgid "Will log quits" -msgstr "" - -#: log.cpp:197 -msgid "Will not log quits" -msgstr "" - -#: log.cpp:199 -msgid "Will log nick changes" -msgstr "" - -#: log.cpp:199 -msgid "Will not log nick changes" -msgstr "" - -#: log.cpp:203 -msgid "Unknown variable. Known variables: joins, quits, nickchanges" -msgstr "" - -#: log.cpp:211 -msgid "Logging joins" -msgstr "" - -#: log.cpp:211 -msgid "Not logging joins" -msgstr "" - -#: log.cpp:212 -msgid "Logging quits" -msgstr "" - -#: log.cpp:212 -msgid "Not logging quits" -msgstr "" - -#: log.cpp:213 -msgid "Logging nick changes" -msgstr "" - -#: log.cpp:214 -msgid "Not logging nick changes" -msgstr "" - -#: log.cpp:351 ->>>>>>> 1.7.x msgid "" "Invalid args [{1}]. Only one log path allowed. Check that there are no " "spaces in the path." msgstr "" -<<<<<<< HEAD #: log.cpp:402 msgid "Invalid log path [{1}]" msgstr "" @@ -223,20 +144,5 @@ msgid "[-sanitize] Optional path where to store logs." msgstr "" #: log.cpp:564 -======= -#: log.cpp:401 -msgid "Invalid log path [{1}]" -msgstr "" - -#: log.cpp:404 -msgid "Logging to [{1}]. Using timestamp format '{2}'" -msgstr "" - -#: log.cpp:559 -msgid "[-sanitize] Optional path where to store logs." -msgstr "" - -#: log.cpp:563 ->>>>>>> 1.7.x msgid "Writes IRC logs." msgstr "" diff --git a/modules/po/log.nl_NL.po b/modules/po/log.nl_NL.po index 0e77a9ac..5c467668 100644 --- a/modules/po/log.nl_NL.po +++ b/modules/po/log.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/log.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/log.pt_BR.po b/modules/po/log.pt_BR.po index fcfb36ef..acfc931b 100644 --- a/modules/po/log.pt_BR.po +++ b/modules/po/log.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/log.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 a0cae8d1..17fe3f93 100644 --- a/modules/po/log.ru_RU.po +++ b/modules/po/log.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/log.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 fd8c2546..582c236a 100644 --- a/modules/po/missingmotd.bg_BG.po +++ b/modules/po/missingmotd.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/missingmotd.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/missingmotd.de_DE.po b/modules/po/missingmotd.de_DE.po index 7bcde73c..b18df902 100644 --- a/modules/po/missingmotd.de_DE.po +++ b/modules/po/missingmotd.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/missingmotd.es_ES.po b/modules/po/missingmotd.es_ES.po index f38863cf..7446aa5c 100644 --- a/modules/po/missingmotd.es_ES.po +++ b/modules/po/missingmotd.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 7296a496..37612886 100644 --- a/modules/po/missingmotd.fr_FR.po +++ b/modules/po/missingmotd.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 630cff3c..d8eb9544 100644 --- a/modules/po/missingmotd.id_ID.po +++ b/modules/po/missingmotd.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f0085df3..67b6715a 100644 --- a/modules/po/missingmotd.it_IT.po +++ b/modules/po/missingmotd.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/missingmotd.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c4d86d4c..fedc542e 100644 --- a/modules/po/missingmotd.nl_NL.po +++ b/modules/po/missingmotd.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/missingmotd.pt_BR.po b/modules/po/missingmotd.pt_BR.po index d33fee81..b07af526 100644 --- a/modules/po/missingmotd.pt_BR.po +++ b/modules/po/missingmotd.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e1553e3e..27717940 100644 --- a/modules/po/missingmotd.ru_RU.po +++ b/modules/po/missingmotd.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/missingmotd.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 fc24fc0e..79c51b2d 100644 --- a/modules/po/modperl.bg_BG.po +++ b/modules/po/modperl.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/modperl.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/modperl.de_DE.po b/modules/po/modperl.de_DE.po index db582ba5..9032236f 100644 --- a/modules/po/modperl.de_DE.po +++ b/modules/po/modperl.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/modperl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/modperl.es_ES.po b/modules/po/modperl.es_ES.po index 62ea178d..b1b45883 100644 --- a/modules/po/modperl.es_ES.po +++ b/modules/po/modperl.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/modperl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c7d3956e..db20797f 100644 --- a/modules/po/modperl.fr_FR.po +++ b/modules/po/modperl.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/modperl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 87723623..323454fd 100644 --- a/modules/po/modperl.id_ID.po +++ b/modules/po/modperl.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/modperl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 beae8a89..a2c0e048 100644 --- a/modules/po/modperl.it_IT.po +++ b/modules/po/modperl.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modperl.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/modperl.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8769f208..9b68fb73 100644 --- a/modules/po/modperl.nl_NL.po +++ b/modules/po/modperl.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/modperl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/modperl.pt_BR.po b/modules/po/modperl.pt_BR.po index 5951f9d4..b9a14268 100644 --- a/modules/po/modperl.pt_BR.po +++ b/modules/po/modperl.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/modperl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 080b32b9..8e1e3db6 100644 --- a/modules/po/modperl.ru_RU.po +++ b/modules/po/modperl.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/modperl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 9e413b08..8afae359 100644 --- a/modules/po/modpython.bg_BG.po +++ b/modules/po/modpython.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/modpython.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/modpython.de_DE.po b/modules/po/modpython.de_DE.po index 861a83c7..4fd978eb 100644 --- a/modules/po/modpython.de_DE.po +++ b/modules/po/modpython.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/modpython.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/modpython.es_ES.po b/modules/po/modpython.es_ES.po index ae58958a..b2a6bc25 100644 --- a/modules/po/modpython.es_ES.po +++ b/modules/po/modpython.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/modpython.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 9159aa84..ea9b65fe 100644 --- a/modules/po/modpython.fr_FR.po +++ b/modules/po/modpython.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/modpython.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 966014a2..0b760841 100644 --- a/modules/po/modpython.id_ID.po +++ b/modules/po/modpython.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/modpython.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 db479cc9..4a2bbafc 100644 --- a/modules/po/modpython.it_IT.po +++ b/modules/po/modpython.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modpython.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/modpython.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 1402abaa..06fd3814 100644 --- a/modules/po/modpython.nl_NL.po +++ b/modules/po/modpython.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/modpython.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/modpython.pt_BR.po b/modules/po/modpython.pt_BR.po index ea504fbe..8672fd0a 100644 --- a/modules/po/modpython.pt_BR.po +++ b/modules/po/modpython.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/modpython.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b2285a6b..851a6fb1 100644 --- a/modules/po/modpython.ru_RU.po +++ b/modules/po/modpython.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/modpython.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 a6d54db6..9cbfaefb 100644 --- a/modules/po/modules_online.bg_BG.po +++ b/modules/po/modules_online.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/modules_online.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/modules_online.de_DE.po b/modules/po/modules_online.de_DE.po index d98d14c6..51a48fb2 100644 --- a/modules/po/modules_online.de_DE.po +++ b/modules/po/modules_online.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/modules_online.es_ES.po b/modules/po/modules_online.es_ES.po index e11fae6a..2735ab67 100644 --- a/modules/po/modules_online.es_ES.po +++ b/modules/po/modules_online.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e18b411a..42a1734f 100644 --- a/modules/po/modules_online.fr_FR.po +++ b/modules/po/modules_online.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 37bc5839..b828c1a3 100644 --- a/modules/po/modules_online.id_ID.po +++ b/modules/po/modules_online.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ca9edd3b..514b19b8 100644 --- a/modules/po/modules_online.it_IT.po +++ b/modules/po/modules_online.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/modules_online.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 4b9e8105..ce7956bf 100644 --- a/modules/po/modules_online.nl_NL.po +++ b/modules/po/modules_online.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/modules_online.pt_BR.po b/modules/po/modules_online.pt_BR.po index faa4343b..92a94664 100644 --- a/modules/po/modules_online.pt_BR.po +++ b/modules/po/modules_online.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 bde18d76..d5b885b9 100644 --- a/modules/po/modules_online.ru_RU.po +++ b/modules/po/modules_online.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/modules_online.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 db57cb17..8bbf05da 100644 --- a/modules/po/nickserv.bg_BG.po +++ b/modules/po/nickserv.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/nickserv.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/nickserv.de_DE.po b/modules/po/nickserv.de_DE.po index 6c593b14..a71b3e1a 100644 --- a/modules/po/nickserv.de_DE.po +++ b/modules/po/nickserv.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/nickserv.es_ES.po b/modules/po/nickserv.es_ES.po index e8673151..baa79c2a 100644 --- a/modules/po/nickserv.es_ES.po +++ b/modules/po/nickserv.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e4f8f2eb..0120c941 100644 --- a/modules/po/nickserv.fr_FR.po +++ b/modules/po/nickserv.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0df8ceaa..83fc27da 100644 --- a/modules/po/nickserv.id_ID.po +++ b/modules/po/nickserv.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 99a40c53..6a2e187a 100644 --- a/modules/po/nickserv.it_IT.po +++ b/modules/po/nickserv.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/nickserv.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0aa74a53..2922e0c9 100644 --- a/modules/po/nickserv.nl_NL.po +++ b/modules/po/nickserv.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/nickserv.pt_BR.po b/modules/po/nickserv.pt_BR.po index b414e166..e92edac9 100644 --- a/modules/po/nickserv.pt_BR.po +++ b/modules/po/nickserv.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 dd42bcb7..7170fc5a 100644 --- a/modules/po/nickserv.ru_RU.po +++ b/modules/po/nickserv.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/nickserv.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8284be87..dc357ac2 100644 --- a/modules/po/notes.bg_BG.po +++ b/modules/po/notes.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/notes.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -38,19 +32,11 @@ msgstr "" msgid "You have no notes to display." msgstr "" -<<<<<<< HEAD #: modules/po/../data/notes/tmpl/index.tmpl:34 notes.cpp:164 notes.cpp:170 msgid "Key" msgstr "" #: modules/po/../data/notes/tmpl/index.tmpl:35 notes.cpp:165 notes.cpp:171 -======= -#: modules/po/../data/notes/tmpl/index.tmpl:34 notes.cpp:164 notes.cpp:169 -msgid "Key" -msgstr "" - -#: modules/po/../data/notes/tmpl/index.tmpl:35 notes.cpp:165 notes.cpp:170 ->>>>>>> 1.7.x msgid "Note" msgstr "" @@ -118,28 +104,16 @@ msgstr "" msgid "That note already exists. Use /#+ to overwrite." msgstr "" -<<<<<<< HEAD #: notes.cpp:186 notes.cpp:188 msgid "You have no entries." msgstr "" #: notes.cpp:224 -======= -#: notes.cpp:185 notes.cpp:187 -msgid "You have no entries." -msgstr "" - -#: notes.cpp:223 ->>>>>>> 1.7.x msgid "" "This user module takes up to one arguments. It can be -disableNotesOnLogin " "not to show notes upon client login" msgstr "" -<<<<<<< HEAD #: notes.cpp:228 -======= -#: notes.cpp:227 ->>>>>>> 1.7.x msgid "Keep and replay notes" msgstr "" diff --git a/modules/po/notes.de_DE.po b/modules/po/notes.de_DE.po index dfca2253..5a6e68a4 100644 --- a/modules/po/notes.de_DE.po +++ b/modules/po/notes.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/notes.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/notes.es_ES.po b/modules/po/notes.es_ES.po index 588d30eb..bfab4cb4 100644 --- a/modules/po/notes.es_ES.po +++ b/modules/po/notes.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/notes.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f66e68ab..bc1710d9 100644 --- a/modules/po/notes.fr_FR.po +++ b/modules/po/notes.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/notes.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d815549f..12ee0b30 100644 --- a/modules/po/notes.id_ID.po +++ b/modules/po/notes.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/notes.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 1b22f332..e63923fa 100644 --- a/modules/po/notes.it_IT.po +++ b/modules/po/notes.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notes.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/notes.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Italian\n" "Language: it_IT\n" @@ -38,19 +32,11 @@ msgstr "" msgid "You have no notes to display." msgstr "" -<<<<<<< HEAD #: modules/po/../data/notes/tmpl/index.tmpl:34 notes.cpp:164 notes.cpp:170 msgid "Key" msgstr "" #: modules/po/../data/notes/tmpl/index.tmpl:35 notes.cpp:165 notes.cpp:171 -======= -#: modules/po/../data/notes/tmpl/index.tmpl:34 notes.cpp:164 notes.cpp:169 -msgid "Key" -msgstr "" - -#: modules/po/../data/notes/tmpl/index.tmpl:35 notes.cpp:165 notes.cpp:170 ->>>>>>> 1.7.x msgid "Note" msgstr "" @@ -118,28 +104,16 @@ msgstr "" msgid "That note already exists. Use /#+ to overwrite." msgstr "" -<<<<<<< HEAD #: notes.cpp:186 notes.cpp:188 msgid "You have no entries." msgstr "" #: notes.cpp:224 -======= -#: notes.cpp:185 notes.cpp:187 -msgid "You have no entries." -msgstr "" - -#: notes.cpp:223 ->>>>>>> 1.7.x msgid "" "This user module takes up to one arguments. It can be -disableNotesOnLogin " "not to show notes upon client login" msgstr "" -<<<<<<< HEAD #: notes.cpp:228 -======= -#: notes.cpp:227 ->>>>>>> 1.7.x msgid "Keep and replay notes" msgstr "" diff --git a/modules/po/notes.nl_NL.po b/modules/po/notes.nl_NL.po index d25324f2..95351975 100644 --- a/modules/po/notes.nl_NL.po +++ b/modules/po/notes.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/notes.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/notes.pt_BR.po b/modules/po/notes.pt_BR.po index 759ee8c0..1d89b544 100644 --- a/modules/po/notes.pt_BR.po +++ b/modules/po/notes.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/notes.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 4aea7075..bb179d9e 100644 --- a/modules/po/notes.ru_RU.po +++ b/modules/po/notes.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/notes.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 a7a4cbd3..543fe774 100644 --- a/modules/po/notify_connect.bg_BG.po +++ b/modules/po/notify_connect.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/notify_connect.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/notify_connect.de_DE.po b/modules/po/notify_connect.de_DE.po index 12fdfa52..e14bdf79 100644 --- a/modules/po/notify_connect.de_DE.po +++ b/modules/po/notify_connect.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/notify_connect.es_ES.po b/modules/po/notify_connect.es_ES.po index cbf7bf65..5f10d164 100644 --- a/modules/po/notify_connect.es_ES.po +++ b/modules/po/notify_connect.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 6c5c9fab..6ec4df87 100644 --- a/modules/po/notify_connect.fr_FR.po +++ b/modules/po/notify_connect.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 9f6b8203..ad82ec99 100644 --- a/modules/po/notify_connect.id_ID.po +++ b/modules/po/notify_connect.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 de51f67a..2c8d946a 100644 --- a/modules/po/notify_connect.it_IT.po +++ b/modules/po/notify_connect.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/notify_connect.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 da59d532..98707dd9 100644 --- a/modules/po/notify_connect.nl_NL.po +++ b/modules/po/notify_connect.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/notify_connect.pt_BR.po b/modules/po/notify_connect.pt_BR.po index 6d0a4661..19ebaca8 100644 --- a/modules/po/notify_connect.pt_BR.po +++ b/modules/po/notify_connect.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 55fa3885..c820d6a3 100644 --- a/modules/po/notify_connect.ru_RU.po +++ b/modules/po/notify_connect.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/notify_connect.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 51e89b1d..be02bad7 100644 --- a/modules/po/perform.bg_BG.po +++ b/modules/po/perform.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/perform.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/perform.de_DE.po b/modules/po/perform.de_DE.po index e3fc8f9e..fc551f0a 100644 --- a/modules/po/perform.de_DE.po +++ b/modules/po/perform.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/perform.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/perform.es_ES.po b/modules/po/perform.es_ES.po index dc720a1f..debd3cd4 100644 --- a/modules/po/perform.es_ES.po +++ b/modules/po/perform.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/perform.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 dd20e9f2..4eb86452 100644 --- a/modules/po/perform.fr_FR.po +++ b/modules/po/perform.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/perform.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 6587636b..11ce0202 100644 --- a/modules/po/perform.id_ID.po +++ b/modules/po/perform.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/perform.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 a751bc04..27f911fc 100644 --- a/modules/po/perform.it_IT.po +++ b/modules/po/perform.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perform.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/perform.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 df2591e9..27d24ca5 100644 --- a/modules/po/perform.nl_NL.po +++ b/modules/po/perform.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/perform.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/perform.pt_BR.po b/modules/po/perform.pt_BR.po index b482aef6..51a8d970 100644 --- a/modules/po/perform.pt_BR.po +++ b/modules/po/perform.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/perform.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 5685cb03..3de074fd 100644 --- a/modules/po/perform.ru_RU.po +++ b/modules/po/perform.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/perform.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 029e15b0..ec6170c0 100644 --- a/modules/po/perleval.bg_BG.po +++ b/modules/po/perleval.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/perleval.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/perleval.de_DE.po b/modules/po/perleval.de_DE.po index f646b795..4c10bf4f 100644 --- a/modules/po/perleval.de_DE.po +++ b/modules/po/perleval.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/perleval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/perleval.es_ES.po b/modules/po/perleval.es_ES.po index dcb33b90..13f5fc95 100644 --- a/modules/po/perleval.es_ES.po +++ b/modules/po/perleval.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/perleval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ef20ef28..cb97b3de 100644 --- a/modules/po/perleval.fr_FR.po +++ b/modules/po/perleval.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/perleval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e4de03da..11548eb7 100644 --- a/modules/po/perleval.id_ID.po +++ b/modules/po/perleval.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/perleval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 bdc7ca3a..bdf78261 100644 --- a/modules/po/perleval.it_IT.po +++ b/modules/po/perleval.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/perleval.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/perleval.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c4dac9b0..46cebe24 100644 --- a/modules/po/perleval.nl_NL.po +++ b/modules/po/perleval.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/perleval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/perleval.pt_BR.po b/modules/po/perleval.pt_BR.po index 8d554f7f..e103529d 100644 --- a/modules/po/perleval.pt_BR.po +++ b/modules/po/perleval.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/perleval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0f62a1ef..86b2c662 100644 --- a/modules/po/perleval.ru_RU.po +++ b/modules/po/perleval.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/perleval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 61712191..66fdf2f8 100644 --- a/modules/po/pyeval.bg_BG.po +++ b/modules/po/pyeval.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/pyeval.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/pyeval.de_DE.po b/modules/po/pyeval.de_DE.po index 962f0b9c..7cc1d984 100644 --- a/modules/po/pyeval.de_DE.po +++ b/modules/po/pyeval.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/pyeval.es_ES.po b/modules/po/pyeval.es_ES.po index 1740bd3c..6a971d35 100644 --- a/modules/po/pyeval.es_ES.po +++ b/modules/po/pyeval.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 1f9809b1..940a1dcd 100644 --- a/modules/po/pyeval.fr_FR.po +++ b/modules/po/pyeval.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0b712f16..cdfd18eb 100644 --- a/modules/po/pyeval.id_ID.po +++ b/modules/po/pyeval.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 38008750..f0dec8c5 100644 --- a/modules/po/pyeval.it_IT.po +++ b/modules/po/pyeval.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/pyeval.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f1e15d98..dfe6d979 100644 --- a/modules/po/pyeval.nl_NL.po +++ b/modules/po/pyeval.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/pyeval.pt_BR.po b/modules/po/pyeval.pt_BR.po index b214260f..031b8d4d 100644 --- a/modules/po/pyeval.pt_BR.po +++ b/modules/po/pyeval.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d3ebf007..10ccd04a 100644 --- a/modules/po/pyeval.ru_RU.po +++ b/modules/po/pyeval.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/pyeval.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8087a043..d73e7d32 100644 --- a/modules/po/raw.bg_BG.po +++ b/modules/po/raw.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/raw.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/raw.de_DE.po b/modules/po/raw.de_DE.po index a670ad18..527c1a49 100644 --- a/modules/po/raw.de_DE.po +++ b/modules/po/raw.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/raw.es_ES.po b/modules/po/raw.es_ES.po index 0b0b1d42..02daba0e 100644 --- a/modules/po/raw.es_ES.po +++ b/modules/po/raw.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 6d37d23e..34aa778f 100644 --- a/modules/po/raw.fr_FR.po +++ b/modules/po/raw.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 99baf73e..293815f1 100644 --- a/modules/po/raw.id_ID.po +++ b/modules/po/raw.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b3763ea6..6dc7d74a 100644 --- a/modules/po/raw.it_IT.po +++ b/modules/po/raw.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/raw.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/raw.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 1feabe45..a8e10794 100644 --- a/modules/po/raw.nl_NL.po +++ b/modules/po/raw.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/raw.pt_BR.po b/modules/po/raw.pt_BR.po index 604d0012..12b4b748 100644 --- a/modules/po/raw.pt_BR.po +++ b/modules/po/raw.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b940dbeb..d7f20b19 100644 --- a/modules/po/raw.ru_RU.po +++ b/modules/po/raw.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 60bc1723..ded2b5ec 100644 --- a/modules/po/route_replies.bg_BG.po +++ b/modules/po/route_replies.bg_BG.po @@ -6,7 +6,6 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" @@ -26,33 +25,11 @@ msgid "This module hit a timeout which is probably a connectivity issue." msgstr "" #: route_replies.cpp:359 -======= -"X-Crowdin-File: /1.7.x/modules/po/route_replies.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" -"Language-Team: Bulgarian\n" -"Language: bg_BG\n" - -#: route_replies.cpp:209 -msgid "[yes|no]" -msgstr "" - -#: route_replies.cpp:210 -msgid "Decides whether to show the timeout messages or not" -msgstr "" - -#: route_replies.cpp:350 -msgid "This module hit a timeout which is probably a connectivity issue." -msgstr "" - -#: route_replies.cpp:353 ->>>>>>> 1.7.x msgid "" "However, if you can provide steps to reproduce this issue, please do report " "a bug." msgstr "" -<<<<<<< HEAD #: route_replies.cpp:362 msgid "To disable this message, do \"/msg {1} silent yes\"" msgstr "" @@ -78,32 +55,5 @@ msgid "Timeout messages are enabled." msgstr "" #: route_replies.cpp:463 -======= -#: route_replies.cpp:356 -msgid "To disable this message, do \"/msg {1} silent yes\"" -msgstr "" - -#: route_replies.cpp:358 -msgid "Last request: {1}" -msgstr "" - -#: route_replies.cpp:359 -msgid "Expected replies:" -msgstr "" - -#: route_replies.cpp:363 -msgid "{1} (last)" -msgstr "" - -#: route_replies.cpp:435 -msgid "Timeout messages are disabled." -msgstr "" - -#: route_replies.cpp:436 -msgid "Timeout messages are enabled." -msgstr "" - -#: route_replies.cpp:457 ->>>>>>> 1.7.x msgid "Send replies (e.g. to /who) to the right client only" msgstr "" diff --git a/modules/po/route_replies.de_DE.po b/modules/po/route_replies.de_DE.po index 01a153bc..aa9efc70 100644 --- a/modules/po/route_replies.de_DE.po +++ b/modules/po/route_replies.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/route_replies.es_ES.po b/modules/po/route_replies.es_ES.po index 6a240183..4ad03572 100644 --- a/modules/po/route_replies.es_ES.po +++ b/modules/po/route_replies.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8f008c42..1ccfc3b2 100644 --- a/modules/po/route_replies.fr_FR.po +++ b/modules/po/route_replies.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 3dbfe4c4..ca8a2369 100644 --- a/modules/po/route_replies.id_ID.po +++ b/modules/po/route_replies.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 559b371c..a087af54 100644 --- a/modules/po/route_replies.it_IT.po +++ b/modules/po/route_replies.it_IT.po @@ -6,7 +6,6 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" @@ -26,33 +25,11 @@ msgid "This module hit a timeout which is probably a connectivity issue." msgstr "" #: route_replies.cpp:359 -======= -"X-Crowdin-File: /1.7.x/modules/po/route_replies.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" -"Language-Team: Italian\n" -"Language: it_IT\n" - -#: route_replies.cpp:209 -msgid "[yes|no]" -msgstr "" - -#: route_replies.cpp:210 -msgid "Decides whether to show the timeout messages or not" -msgstr "" - -#: route_replies.cpp:350 -msgid "This module hit a timeout which is probably a connectivity issue." -msgstr "" - -#: route_replies.cpp:353 ->>>>>>> 1.7.x msgid "" "However, if you can provide steps to reproduce this issue, please do report " "a bug." msgstr "" -<<<<<<< HEAD #: route_replies.cpp:362 msgid "To disable this message, do \"/msg {1} silent yes\"" msgstr "" @@ -78,32 +55,5 @@ msgid "Timeout messages are enabled." msgstr "" #: route_replies.cpp:463 -======= -#: route_replies.cpp:356 -msgid "To disable this message, do \"/msg {1} silent yes\"" -msgstr "" - -#: route_replies.cpp:358 -msgid "Last request: {1}" -msgstr "" - -#: route_replies.cpp:359 -msgid "Expected replies:" -msgstr "" - -#: route_replies.cpp:363 -msgid "{1} (last)" -msgstr "" - -#: route_replies.cpp:435 -msgid "Timeout messages are disabled." -msgstr "" - -#: route_replies.cpp:436 -msgid "Timeout messages are enabled." -msgstr "" - -#: route_replies.cpp:457 ->>>>>>> 1.7.x msgid "Send replies (e.g. to /who) to the right client only" msgstr "" diff --git a/modules/po/route_replies.nl_NL.po b/modules/po/route_replies.nl_NL.po index 94acbc61..372df636 100644 --- a/modules/po/route_replies.nl_NL.po +++ b/modules/po/route_replies.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/route_replies.pt_BR.po b/modules/po/route_replies.pt_BR.po index 32efa767..2bcfc5a4 100644 --- a/modules/po/route_replies.pt_BR.po +++ b/modules/po/route_replies.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 5e1d50e6..1a7f1aeb 100644 --- a/modules/po/route_replies.ru_RU.po +++ b/modules/po/route_replies.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/route_replies.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 9e0176db..2c3bcfc8 100644 --- a/modules/po/sample.bg_BG.po +++ b/modules/po/sample.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/sample.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/sample.de_DE.po b/modules/po/sample.de_DE.po index 1b63f917..c7ba9d5c 100644 --- a/modules/po/sample.de_DE.po +++ b/modules/po/sample.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/sample.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/sample.es_ES.po b/modules/po/sample.es_ES.po index 560e95fb..5cf197b5 100644 --- a/modules/po/sample.es_ES.po +++ b/modules/po/sample.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/sample.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b44498b5..8d2caba1 100644 --- a/modules/po/sample.fr_FR.po +++ b/modules/po/sample.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/sample.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0c168860..026d0544 100644 --- a/modules/po/sample.id_ID.po +++ b/modules/po/sample.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/sample.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 4d18d8c2..451c6b8d 100644 --- a/modules/po/sample.it_IT.po +++ b/modules/po/sample.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sample.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/sample.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 18b40a3d..474f17e0 100644 --- a/modules/po/sample.nl_NL.po +++ b/modules/po/sample.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/sample.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/sample.pt_BR.po b/modules/po/sample.pt_BR.po index 57b0ecf5..1eebf8dd 100644 --- a/modules/po/sample.pt_BR.po +++ b/modules/po/sample.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/sample.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 bf4ddf34..16e9a54e 100644 --- a/modules/po/sample.ru_RU.po +++ b/modules/po/sample.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/sample.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 6d773477..e62d2785 100644 --- a/modules/po/samplewebapi.bg_BG.po +++ b/modules/po/samplewebapi.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/samplewebapi.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/samplewebapi.de_DE.po b/modules/po/samplewebapi.de_DE.po index 7e727737..9583b005 100644 --- a/modules/po/samplewebapi.de_DE.po +++ b/modules/po/samplewebapi.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/samplewebapi.es_ES.po b/modules/po/samplewebapi.es_ES.po index 74029bbf..7188c0d8 100644 --- a/modules/po/samplewebapi.es_ES.po +++ b/modules/po/samplewebapi.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e6b74458..3bf58b51 100644 --- a/modules/po/samplewebapi.fr_FR.po +++ b/modules/po/samplewebapi.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8bbaba16..0e21c2c4 100644 --- a/modules/po/samplewebapi.id_ID.po +++ b/modules/po/samplewebapi.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0d22b2a8..982c95c2 100644 --- a/modules/po/samplewebapi.it_IT.po +++ b/modules/po/samplewebapi.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/samplewebapi.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 0bd75b87..d07fe530 100644 --- a/modules/po/samplewebapi.nl_NL.po +++ b/modules/po/samplewebapi.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/samplewebapi.pt_BR.po b/modules/po/samplewebapi.pt_BR.po index e24a72a8..98368767 100644 --- a/modules/po/samplewebapi.pt_BR.po +++ b/modules/po/samplewebapi.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 37af4f32..1e96b360 100644 --- a/modules/po/samplewebapi.ru_RU.po +++ b/modules/po/samplewebapi.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/samplewebapi.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f517f2d3..39ce1b18 100644 --- a/modules/po/sasl.bg_BG.po +++ b/modules/po/sasl.bg_BG.po @@ -6,7 +6,6 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" @@ -14,15 +13,6 @@ msgstr "" "Language: bg_BG\n" #: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:292 -======= -"X-Crowdin-File: /1.7.x/modules/po/sasl.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" -"Language-Team: Bulgarian\n" -"Language: bg_BG\n" - -#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:290 ->>>>>>> 1.7.x msgid "SASL" msgstr "" @@ -62,11 +52,7 @@ msgstr "" msgid "Name" msgstr "" -<<<<<<< HEAD #: modules/po/../data/sasl/tmpl/index.tmpl:43 sasl.cpp:89 sasl.cpp:95 -======= -#: modules/po/../data/sasl/tmpl/index.tmpl:43 sasl.cpp:89 sasl.cpp:94 ->>>>>>> 1.7.x msgid "Description" msgstr "" @@ -121,7 +107,6 @@ msgstr "" msgid "Don't connect unless SASL authentication succeeds" msgstr "" -<<<<<<< HEAD #: sasl.cpp:88 sasl.cpp:94 msgid "Mechanism" msgstr "" @@ -183,69 +168,6 @@ msgid "{1} mechanism failed." msgstr "" #: sasl.cpp:337 -======= -#: sasl.cpp:88 sasl.cpp:93 -msgid "Mechanism" -msgstr "" - -#: sasl.cpp:97 -msgid "The following mechanisms are available:" -msgstr "" - -#: sasl.cpp:107 -msgid "Username is currently not set" -msgstr "" - -#: sasl.cpp:109 -msgid "Username is currently set to '{1}'" -msgstr "" - -#: sasl.cpp:112 -msgid "Password was not supplied" -msgstr "" - -#: sasl.cpp:114 -msgid "Password was supplied" -msgstr "" - -#: sasl.cpp:122 -msgid "Username has been set to [{1}]" -msgstr "" - -#: sasl.cpp:123 -msgid "Password has been set to [{1}]" -msgstr "" - -#: sasl.cpp:143 -msgid "Current mechanisms set: {1}" -msgstr "" - -#: sasl.cpp:152 -msgid "We require SASL negotiation to connect" -msgstr "" - -#: sasl.cpp:154 -msgid "We will connect even if SASL fails" -msgstr "" - -#: sasl.cpp:191 -msgid "Disabling network, we require authentication." -msgstr "" - -#: sasl.cpp:192 -msgid "Use 'RequireAuth no' to disable." -msgstr "" - -#: sasl.cpp:245 -msgid "{1} mechanism succeeded." -msgstr "" - -#: sasl.cpp:257 -msgid "{1} mechanism failed." -msgstr "" - -#: sasl.cpp:335 ->>>>>>> 1.7.x msgid "" "Adds support for sasl authentication capability to authenticate to an IRC " "server" diff --git a/modules/po/sasl.de_DE.po b/modules/po/sasl.de_DE.po index 1fc9d040..72601930 100644 --- a/modules/po/sasl.de_DE.po +++ b/modules/po/sasl.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/sasl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/sasl.es_ES.po b/modules/po/sasl.es_ES.po index 5cc3df9b..2f1eea18 100644 --- a/modules/po/sasl.es_ES.po +++ b/modules/po/sasl.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/sasl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 15c30bc3..0421956e 100644 --- a/modules/po/sasl.fr_FR.po +++ b/modules/po/sasl.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/sasl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ca9b22d9..35e711bd 100644 --- a/modules/po/sasl.id_ID.po +++ b/modules/po/sasl.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/sasl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 1bba5d0c..8baf807a 100644 --- a/modules/po/sasl.it_IT.po +++ b/modules/po/sasl.it_IT.po @@ -6,7 +6,6 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/sasl.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" @@ -14,15 +13,6 @@ msgstr "" "Language: it_IT\n" #: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:292 -======= -"X-Crowdin-File: /1.7.x/modules/po/sasl.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" -"Language-Team: Italian\n" -"Language: it_IT\n" - -#: modules/po/../data/sasl/tmpl/index.tmpl:7 sasl.cpp:290 ->>>>>>> 1.7.x msgid "SASL" msgstr "" @@ -62,11 +52,7 @@ msgstr "" msgid "Name" msgstr "" -<<<<<<< HEAD #: modules/po/../data/sasl/tmpl/index.tmpl:43 sasl.cpp:89 sasl.cpp:95 -======= -#: modules/po/../data/sasl/tmpl/index.tmpl:43 sasl.cpp:89 sasl.cpp:94 ->>>>>>> 1.7.x msgid "Description" msgstr "" @@ -121,7 +107,6 @@ msgstr "" msgid "Don't connect unless SASL authentication succeeds" msgstr "" -<<<<<<< HEAD #: sasl.cpp:88 sasl.cpp:94 msgid "Mechanism" msgstr "" @@ -183,69 +168,6 @@ msgid "{1} mechanism failed." msgstr "" #: sasl.cpp:337 -======= -#: sasl.cpp:88 sasl.cpp:93 -msgid "Mechanism" -msgstr "" - -#: sasl.cpp:97 -msgid "The following mechanisms are available:" -msgstr "" - -#: sasl.cpp:107 -msgid "Username is currently not set" -msgstr "" - -#: sasl.cpp:109 -msgid "Username is currently set to '{1}'" -msgstr "" - -#: sasl.cpp:112 -msgid "Password was not supplied" -msgstr "" - -#: sasl.cpp:114 -msgid "Password was supplied" -msgstr "" - -#: sasl.cpp:122 -msgid "Username has been set to [{1}]" -msgstr "" - -#: sasl.cpp:123 -msgid "Password has been set to [{1}]" -msgstr "" - -#: sasl.cpp:143 -msgid "Current mechanisms set: {1}" -msgstr "" - -#: sasl.cpp:152 -msgid "We require SASL negotiation to connect" -msgstr "" - -#: sasl.cpp:154 -msgid "We will connect even if SASL fails" -msgstr "" - -#: sasl.cpp:191 -msgid "Disabling network, we require authentication." -msgstr "" - -#: sasl.cpp:192 -msgid "Use 'RequireAuth no' to disable." -msgstr "" - -#: sasl.cpp:245 -msgid "{1} mechanism succeeded." -msgstr "" - -#: sasl.cpp:257 -msgid "{1} mechanism failed." -msgstr "" - -#: sasl.cpp:335 ->>>>>>> 1.7.x msgid "" "Adds support for sasl authentication capability to authenticate to an IRC " "server" diff --git a/modules/po/sasl.nl_NL.po b/modules/po/sasl.nl_NL.po index 03e0c2ce..ee18f3e7 100644 --- a/modules/po/sasl.nl_NL.po +++ b/modules/po/sasl.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/sasl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/sasl.pt_BR.po b/modules/po/sasl.pt_BR.po index 504a6367..63e6f585 100644 --- a/modules/po/sasl.pt_BR.po +++ b/modules/po/sasl.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/sasl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d858d56a..615358ed 100644 --- a/modules/po/sasl.ru_RU.po +++ b/modules/po/sasl.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/sasl.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d920945f..004bcafa 100644 --- a/modules/po/savebuff.bg_BG.po +++ b/modules/po/savebuff.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/savebuff.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/savebuff.de_DE.po b/modules/po/savebuff.de_DE.po index 182dce21..3a61e461 100644 --- a/modules/po/savebuff.de_DE.po +++ b/modules/po/savebuff.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/savebuff.es_ES.po b/modules/po/savebuff.es_ES.po index 67310b49..a04f38e8 100644 --- a/modules/po/savebuff.es_ES.po +++ b/modules/po/savebuff.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 77a2e4e7..de21141f 100644 --- a/modules/po/savebuff.fr_FR.po +++ b/modules/po/savebuff.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 67265bef..a5502cf6 100644 --- a/modules/po/savebuff.id_ID.po +++ b/modules/po/savebuff.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 9d196d8c..7c9e3bff 100644 --- a/modules/po/savebuff.it_IT.po +++ b/modules/po/savebuff.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/savebuff.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 23ce112a..f451beba 100644 --- a/modules/po/savebuff.nl_NL.po +++ b/modules/po/savebuff.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/savebuff.pt_BR.po b/modules/po/savebuff.pt_BR.po index 39163f9d..e3e7d82a 100644 --- a/modules/po/savebuff.pt_BR.po +++ b/modules/po/savebuff.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 662a780e..0d5b6d45 100644 --- a/modules/po/savebuff.ru_RU.po +++ b/modules/po/savebuff.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/savebuff.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 061a6777..1f5482c5 100644 --- a/modules/po/send_raw.bg_BG.po +++ b/modules/po/send_raw.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/send_raw.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/send_raw.de_DE.po b/modules/po/send_raw.de_DE.po index a305704e..0c28ee46 100644 --- a/modules/po/send_raw.de_DE.po +++ b/modules/po/send_raw.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/send_raw.es_ES.po b/modules/po/send_raw.es_ES.po index 5e7eab42..de67196f 100644 --- a/modules/po/send_raw.es_ES.po +++ b/modules/po/send_raw.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f201d71e..a22c93f3 100644 --- a/modules/po/send_raw.fr_FR.po +++ b/modules/po/send_raw.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f8b6a8e1..58b97a74 100644 --- a/modules/po/send_raw.id_ID.po +++ b/modules/po/send_raw.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 b78332f3..e80932c0 100644 --- a/modules/po/send_raw.it_IT.po +++ b/modules/po/send_raw.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/send_raw.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d34ff5c4..03516aaa 100644 --- a/modules/po/send_raw.nl_NL.po +++ b/modules/po/send_raw.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/send_raw.pt_BR.po b/modules/po/send_raw.pt_BR.po index d60d87ba..26ebb856 100644 --- a/modules/po/send_raw.pt_BR.po +++ b/modules/po/send_raw.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 9c10c9c3..4994fa80 100644 --- a/modules/po/send_raw.ru_RU.po +++ b/modules/po/send_raw.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/send_raw.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 24f7d24d..9c5ff933 100644 --- a/modules/po/shell.bg_BG.po +++ b/modules/po/shell.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/shell.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/shell.de_DE.po b/modules/po/shell.de_DE.po index ed91b52c..82d524a1 100644 --- a/modules/po/shell.de_DE.po +++ b/modules/po/shell.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/shell.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/shell.es_ES.po b/modules/po/shell.es_ES.po index 9722f819..b4bc7125 100644 --- a/modules/po/shell.es_ES.po +++ b/modules/po/shell.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/shell.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 17856265..fc058541 100644 --- a/modules/po/shell.fr_FR.po +++ b/modules/po/shell.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/shell.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 bd718e48..2a924bed 100644 --- a/modules/po/shell.id_ID.po +++ b/modules/po/shell.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/shell.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 19488869..47a0a56d 100644 --- a/modules/po/shell.it_IT.po +++ b/modules/po/shell.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/shell.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/shell.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 6aae23c2..354460b1 100644 --- a/modules/po/shell.nl_NL.po +++ b/modules/po/shell.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/shell.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/shell.pt_BR.po b/modules/po/shell.pt_BR.po index 76775077..624e89ba 100644 --- a/modules/po/shell.pt_BR.po +++ b/modules/po/shell.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/shell.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 30da848c..831653d9 100644 --- a/modules/po/shell.ru_RU.po +++ b/modules/po/shell.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/shell.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 7441fa6e..cb78a11a 100644 --- a/modules/po/simple_away.bg_BG.po +++ b/modules/po/simple_away.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/simple_away.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/simple_away.de_DE.po b/modules/po/simple_away.de_DE.po index a316874c..0f9830fc 100644 --- a/modules/po/simple_away.de_DE.po +++ b/modules/po/simple_away.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/simple_away.es_ES.po b/modules/po/simple_away.es_ES.po index da8b1c2a..077e0353 100644 --- a/modules/po/simple_away.es_ES.po +++ b/modules/po/simple_away.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 6fc033db..70682ae4 100644 --- a/modules/po/simple_away.fr_FR.po +++ b/modules/po/simple_away.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 4898e7c8..a7ebcd2f 100644 --- a/modules/po/simple_away.id_ID.po +++ b/modules/po/simple_away.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 264f6b11..a0b684dd 100644 --- a/modules/po/simple_away.it_IT.po +++ b/modules/po/simple_away.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/simple_away.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d949037c..64ebda77 100644 --- a/modules/po/simple_away.nl_NL.po +++ b/modules/po/simple_away.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/simple_away.pt_BR.po b/modules/po/simple_away.pt_BR.po index 333a2d1c..a1821c21 100644 --- a/modules/po/simple_away.pt_BR.po +++ b/modules/po/simple_away.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 a79ba401..0f042b1a 100644 --- a/modules/po/simple_away.ru_RU.po +++ b/modules/po/simple_away.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/simple_away.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 5c514fde..7451002d 100644 --- a/modules/po/stickychan.bg_BG.po +++ b/modules/po/stickychan.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/stickychan.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/stickychan.de_DE.po b/modules/po/stickychan.de_DE.po index 90137bb7..9002c51a 100644 --- a/modules/po/stickychan.de_DE.po +++ b/modules/po/stickychan.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/stickychan.es_ES.po b/modules/po/stickychan.es_ES.po index a88aacc6..ff7ed05d 100644 --- a/modules/po/stickychan.es_ES.po +++ b/modules/po/stickychan.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 5689aa1f..50a9a4ff 100644 --- a/modules/po/stickychan.fr_FR.po +++ b/modules/po/stickychan.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 90f3ba9b..f27be880 100644 --- a/modules/po/stickychan.id_ID.po +++ b/modules/po/stickychan.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ac762ba7..12ad984b 100644 --- a/modules/po/stickychan.it_IT.po +++ b/modules/po/stickychan.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/stickychan.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e56f89e3..66b0b5b5 100644 --- a/modules/po/stickychan.nl_NL.po +++ b/modules/po/stickychan.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/stickychan.pt_BR.po b/modules/po/stickychan.pt_BR.po index c25e5464..97fea509 100644 --- a/modules/po/stickychan.pt_BR.po +++ b/modules/po/stickychan.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 f9ece309..d0ced1e9 100644 --- a/modules/po/stickychan.ru_RU.po +++ b/modules/po/stickychan.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/stickychan.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 ec090ce0..cbefc622 100644 --- a/modules/po/stripcontrols.bg_BG.po +++ b/modules/po/stripcontrols.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/stripcontrols.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/stripcontrols.de_DE.po b/modules/po/stripcontrols.de_DE.po index b68007f6..c516d02a 100644 --- a/modules/po/stripcontrols.de_DE.po +++ b/modules/po/stripcontrols.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/stripcontrols.es_ES.po b/modules/po/stripcontrols.es_ES.po index a8795d31..f23cab73 100644 --- a/modules/po/stripcontrols.es_ES.po +++ b/modules/po/stripcontrols.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 56a3bb2d..c9d8dfe7 100644 --- a/modules/po/stripcontrols.fr_FR.po +++ b/modules/po/stripcontrols.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 912c4a7f..5f5f1d2a 100644 --- a/modules/po/stripcontrols.id_ID.po +++ b/modules/po/stripcontrols.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 7f6c7e24..91ec0055 100644 --- a/modules/po/stripcontrols.it_IT.po +++ b/modules/po/stripcontrols.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/stripcontrols.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 61249615..02f818e9 100644 --- a/modules/po/stripcontrols.nl_NL.po +++ b/modules/po/stripcontrols.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/stripcontrols.pt_BR.po b/modules/po/stripcontrols.pt_BR.po index 066135d9..92750235 100644 --- a/modules/po/stripcontrols.pt_BR.po +++ b/modules/po/stripcontrols.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 485e8854..70ee9ab2 100644 --- a/modules/po/stripcontrols.ru_RU.po +++ b/modules/po/stripcontrols.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/stripcontrols.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 374188ca..000419d1 100644 --- a/modules/po/watch.bg_BG.po +++ b/modules/po/watch.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/watch.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -126,7 +120,6 @@ msgstr "" msgid "Id {1} removed." msgstr "" -<<<<<<< HEAD #: watch.cpp:600 watch.cpp:605 watch.cpp:610 watch.cpp:615 watch.cpp:621 #: watch.cpp:626 watch.cpp:630 watch.cpp:634 watch.cpp:639 watch.cpp:646 #: watch.cpp:653 watch.cpp:659 watch.cpp:665 @@ -252,132 +245,5 @@ msgid "WARNING: malformed entry found while loading" msgstr "" #: watch.cpp:779 -======= -#: watch.cpp:600 watch.cpp:604 watch.cpp:609 watch.cpp:614 watch.cpp:620 -#: watch.cpp:625 watch.cpp:629 watch.cpp:633 watch.cpp:638 watch.cpp:645 -#: watch.cpp:652 watch.cpp:658 watch.cpp:664 -msgid "Command" -msgstr "" - -#: watch.cpp:601 watch.cpp:605 watch.cpp:610 watch.cpp:616 watch.cpp:621 -#: watch.cpp:626 watch.cpp:630 watch.cpp:634 watch.cpp:641 watch.cpp:648 -#: watch.cpp:654 watch.cpp:660 watch.cpp:665 -msgid "Description" -msgstr "" - -#: watch.cpp:604 -msgid "Add [Target] [Pattern]" -msgstr "" - -#: watch.cpp:606 -msgid "Used to add an entry to watch for." -msgstr "" - -#: watch.cpp:609 -msgid "List" -msgstr "" - -#: watch.cpp:611 -msgid "List all entries being watched." -msgstr "" - -#: watch.cpp:614 -msgid "Dump" -msgstr "" - -#: watch.cpp:617 -msgid "Dump a list of all current entries to be used later." -msgstr "" - -#: watch.cpp:620 -msgid "Del " -msgstr "" - -#: watch.cpp:622 -msgid "Deletes Id from the list of watched entries." -msgstr "" - -#: watch.cpp:625 -msgid "Clear" -msgstr "" - -#: watch.cpp:626 -msgid "Delete all entries." -msgstr "" - -#: watch.cpp:629 -msgid "Enable " -msgstr "" - -#: watch.cpp:630 -msgid "Enable a disabled entry." -msgstr "" - -#: watch.cpp:633 -msgid "Disable " -msgstr "" - -#: watch.cpp:635 -msgid "Disable (but don't delete) an entry." -msgstr "" - -#: watch.cpp:639 -msgid "SetDetachedClientOnly " -msgstr "" - -#: watch.cpp:642 -msgid "Enable or disable detached client only for an entry." -msgstr "" - -#: watch.cpp:646 -msgid "SetDetachedChannelOnly " -msgstr "" - -#: watch.cpp:649 -msgid "Enable or disable detached channel only for an entry." -msgstr "" - -#: watch.cpp:652 -msgid "Buffer [Count]" -msgstr "" - -#: watch.cpp:655 -msgid "Show/Set the amount of buffered lines while detached." -msgstr "" - -#: watch.cpp:659 -msgid "SetSources [#chan priv #foo* !#bar]" -msgstr "" - -#: watch.cpp:661 -msgid "Set the source channels that you care about." -msgstr "" - -#: watch.cpp:664 -msgid "Help" -msgstr "" - -#: watch.cpp:665 -msgid "This help." -msgstr "" - -#: watch.cpp:681 -msgid "Entry for {1} already exists." -msgstr "" - -#: watch.cpp:689 -msgid "Adding entry: {1} watching for [{2}] -> {3}" -msgstr "" - -#: watch.cpp:695 -msgid "Watch: Not enough arguments. Try Help" -msgstr "" - -#: watch.cpp:764 -msgid "WARNING: malformed entry found while loading" -msgstr "" - -#: watch.cpp:778 ->>>>>>> 1.7.x msgid "Copy activity from a specific user into a separate window" msgstr "" diff --git a/modules/po/watch.de_DE.po b/modules/po/watch.de_DE.po index a3705797..cb8a06a3 100644 --- a/modules/po/watch.de_DE.po +++ b/modules/po/watch.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/watch.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/watch.es_ES.po b/modules/po/watch.es_ES.po index 41f45053..a1905471 100644 --- a/modules/po/watch.es_ES.po +++ b/modules/po/watch.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/watch.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 8b74bd4d..c825b2d5 100644 --- a/modules/po/watch.fr_FR.po +++ b/modules/po/watch.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/watch.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 d314cfd1..18a0f10d 100644 --- a/modules/po/watch.id_ID.po +++ b/modules/po/watch.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/watch.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 9c9c0c32..71264a4f 100644 --- a/modules/po/watch.it_IT.po +++ b/modules/po/watch.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/watch.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/watch.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Italian\n" "Language: it_IT\n" @@ -126,7 +120,6 @@ msgstr "" msgid "Id {1} removed." msgstr "" -<<<<<<< HEAD #: watch.cpp:600 watch.cpp:605 watch.cpp:610 watch.cpp:615 watch.cpp:621 #: watch.cpp:626 watch.cpp:630 watch.cpp:634 watch.cpp:639 watch.cpp:646 #: watch.cpp:653 watch.cpp:659 watch.cpp:665 @@ -252,132 +245,5 @@ msgid "WARNING: malformed entry found while loading" msgstr "" #: watch.cpp:779 -======= -#: watch.cpp:600 watch.cpp:604 watch.cpp:609 watch.cpp:614 watch.cpp:620 -#: watch.cpp:625 watch.cpp:629 watch.cpp:633 watch.cpp:638 watch.cpp:645 -#: watch.cpp:652 watch.cpp:658 watch.cpp:664 -msgid "Command" -msgstr "" - -#: watch.cpp:601 watch.cpp:605 watch.cpp:610 watch.cpp:616 watch.cpp:621 -#: watch.cpp:626 watch.cpp:630 watch.cpp:634 watch.cpp:641 watch.cpp:648 -#: watch.cpp:654 watch.cpp:660 watch.cpp:665 -msgid "Description" -msgstr "" - -#: watch.cpp:604 -msgid "Add [Target] [Pattern]" -msgstr "" - -#: watch.cpp:606 -msgid "Used to add an entry to watch for." -msgstr "" - -#: watch.cpp:609 -msgid "List" -msgstr "" - -#: watch.cpp:611 -msgid "List all entries being watched." -msgstr "" - -#: watch.cpp:614 -msgid "Dump" -msgstr "" - -#: watch.cpp:617 -msgid "Dump a list of all current entries to be used later." -msgstr "" - -#: watch.cpp:620 -msgid "Del " -msgstr "" - -#: watch.cpp:622 -msgid "Deletes Id from the list of watched entries." -msgstr "" - -#: watch.cpp:625 -msgid "Clear" -msgstr "" - -#: watch.cpp:626 -msgid "Delete all entries." -msgstr "" - -#: watch.cpp:629 -msgid "Enable " -msgstr "" - -#: watch.cpp:630 -msgid "Enable a disabled entry." -msgstr "" - -#: watch.cpp:633 -msgid "Disable " -msgstr "" - -#: watch.cpp:635 -msgid "Disable (but don't delete) an entry." -msgstr "" - -#: watch.cpp:639 -msgid "SetDetachedClientOnly " -msgstr "" - -#: watch.cpp:642 -msgid "Enable or disable detached client only for an entry." -msgstr "" - -#: watch.cpp:646 -msgid "SetDetachedChannelOnly " -msgstr "" - -#: watch.cpp:649 -msgid "Enable or disable detached channel only for an entry." -msgstr "" - -#: watch.cpp:652 -msgid "Buffer [Count]" -msgstr "" - -#: watch.cpp:655 -msgid "Show/Set the amount of buffered lines while detached." -msgstr "" - -#: watch.cpp:659 -msgid "SetSources [#chan priv #foo* !#bar]" -msgstr "" - -#: watch.cpp:661 -msgid "Set the source channels that you care about." -msgstr "" - -#: watch.cpp:664 -msgid "Help" -msgstr "" - -#: watch.cpp:665 -msgid "This help." -msgstr "" - -#: watch.cpp:681 -msgid "Entry for {1} already exists." -msgstr "" - -#: watch.cpp:689 -msgid "Adding entry: {1} watching for [{2}] -> {3}" -msgstr "" - -#: watch.cpp:695 -msgid "Watch: Not enough arguments. Try Help" -msgstr "" - -#: watch.cpp:764 -msgid "WARNING: malformed entry found while loading" -msgstr "" - -#: watch.cpp:778 ->>>>>>> 1.7.x msgid "Copy activity from a specific user into a separate window" msgstr "" diff --git a/modules/po/watch.nl_NL.po b/modules/po/watch.nl_NL.po index 776ae12b..c91dba1d 100644 --- a/modules/po/watch.nl_NL.po +++ b/modules/po/watch.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/watch.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/watch.pt_BR.po b/modules/po/watch.pt_BR.po index a3c0ad3f..d45205df 100644 --- a/modules/po/watch.pt_BR.po +++ b/modules/po/watch.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/watch.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 001cf9d4..39bacf06 100644 --- a/modules/po/watch.ru_RU.po +++ b/modules/po/watch.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/watch.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 fbba4e4b..79b3c208 100644 --- a/modules/po/webadmin.bg_BG.po +++ b/modules/po/webadmin.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/webadmin.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" diff --git a/modules/po/webadmin.de_DE.po b/modules/po/webadmin.de_DE.po index 9a89c267..acd9a203 100644 --- a/modules/po/webadmin.de_DE.po +++ b/modules/po/webadmin.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" diff --git a/modules/po/webadmin.es_ES.po b/modules/po/webadmin.es_ES.po index 418d8a75..43e7a015 100644 --- a/modules/po/webadmin.es_ES.po +++ b/modules/po/webadmin.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 e9599eec..67f4656b 100644 --- a/modules/po/webadmin.fr_FR.po +++ b/modules/po/webadmin.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 1d23eb04..42f2f3c2 100644 --- a/modules/po/webadmin.id_ID.po +++ b/modules/po/webadmin.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 c32812af..1eba8fca 100644 --- a/modules/po/webadmin.it_IT.po +++ b/modules/po/webadmin.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/modules/po/webadmin.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 663379cd..ad49ad1a 100644 --- a/modules/po/webadmin.nl_NL.po +++ b/modules/po/webadmin.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" diff --git a/modules/po/webadmin.pt_BR.po b/modules/po/webadmin.pt_BR.po index d49fc9ba..37b92c72 100644 --- a/modules/po/webadmin.pt_BR.po +++ b/modules/po/webadmin.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 03270838..a8f61f6a 100644 --- a/modules/po/webadmin.ru_RU.po +++ b/modules/po/webadmin.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/modules/po/webadmin.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "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 001823ed..aff707d8 100644 --- a/src/po/znc.bg_BG.po +++ b/src/po/znc.bg_BG.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: bg\n" -<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/src/po/znc.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Bulgarian\n" "Language: bg_BG\n" @@ -57,7 +51,6 @@ msgid "" "code>”). Once you have loaded some Web-enabled modules, the menu will expand." msgstr "" -<<<<<<< HEAD #: znc.cpp:1562 msgid "User already exists" msgstr "" @@ -79,29 +72,6 @@ msgid "Invalid port" msgstr "" #: znc.cpp:1821 ClientCommand.cpp:1637 -======= -#: znc.cpp:1563 -msgid "User already exists" -msgstr "" - -#: znc.cpp:1671 -msgid "IPv6 is not enabled" -msgstr "" - -#: znc.cpp:1679 -msgid "SSL is not enabled" -msgstr "" - -#: znc.cpp:1687 -msgid "Unable to locate pem file: {1}" -msgstr "" - -#: znc.cpp:1706 -msgid "Invalid port" -msgstr "" - -#: znc.cpp:1822 ClientCommand.cpp:1629 ->>>>>>> 1.7.x msgid "Unable to bind: {1}" msgstr "" @@ -109,7 +79,6 @@ msgstr "" msgid "Jumping servers because this server is no longer in the list" msgstr "" -<<<<<<< HEAD #: IRCNetwork.cpp:669 User.cpp:678 msgid "Welcome to ZNC" msgstr "" @@ -135,33 +104,6 @@ msgid "Cannot connect to {1}, because ZNC is not compiled with SSL support." msgstr "" #: IRCNetwork.cpp:1329 -======= -#: IRCNetwork.cpp:640 User.cpp:678 -msgid "Welcome to ZNC" -msgstr "" - -#: IRCNetwork.cpp:728 -msgid "You are currently disconnected from IRC. Use 'connect' to reconnect." -msgstr "" - -#: IRCNetwork.cpp:758 -msgid "This network is being deleted or moved to another user." -msgstr "" - -#: IRCNetwork.cpp:987 -msgid "The channel {1} could not be joined, disabling it." -msgstr "" - -#: IRCNetwork.cpp:1116 -msgid "Your current server was removed, jumping..." -msgstr "" - -#: IRCNetwork.cpp:1279 -msgid "Cannot connect to {1}, because ZNC is not compiled with SSL support." -msgstr "" - -#: IRCNetwork.cpp:1300 ->>>>>>> 1.7.x msgid "Some module aborted the connection attempt" msgstr "" @@ -341,11 +283,7 @@ msgctxt "modhelpcmd" msgid "Generate this output" msgstr "" -<<<<<<< HEAD #: Modules.cpp:573 ClientCommand.cpp:1904 -======= -#: Modules.cpp:573 ClientCommand.cpp:1894 ->>>>>>> 1.7.x msgid "No matches for '{1}'" msgstr "" @@ -439,20 +377,12 @@ msgid "" "this module." msgstr "" -<<<<<<< HEAD #: Modules.cpp:2023 Modules.cpp:2029 -======= -#: Modules.cpp:2022 Modules.cpp:2028 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Command" msgstr "" -<<<<<<< HEAD #: Modules.cpp:2024 Modules.cpp:2031 -======= -#: Modules.cpp:2023 Modules.cpp:2029 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Description" msgstr "" @@ -460,15 +390,9 @@ msgstr "" #: ClientCommand.cpp:51 ClientCommand.cpp:115 ClientCommand.cpp:137 #: ClientCommand.cpp:749 ClientCommand.cpp:768 ClientCommand.cpp:794 #: ClientCommand.cpp:827 ClientCommand.cpp:840 ClientCommand.cpp:853 -<<<<<<< HEAD #: ClientCommand.cpp:868 ClientCommand.cpp:1329 ClientCommand.cpp:1377 #: ClientCommand.cpp:1409 ClientCommand.cpp:1420 ClientCommand.cpp:1429 #: ClientCommand.cpp:1441 -======= -#: ClientCommand.cpp:868 ClientCommand.cpp:1321 ClientCommand.cpp:1369 -#: ClientCommand.cpp:1401 ClientCommand.cpp:1412 ClientCommand.cpp:1421 -#: ClientCommand.cpp:1433 ->>>>>>> 1.7.x msgid "You must be connected with a network to use this command" msgstr "" @@ -688,11 +612,7 @@ msgctxt "listnetworks" msgid "No networks" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:632 ClientCommand.cpp:936 -======= -#: ClientCommand.cpp:632 ClientCommand.cpp:932 ->>>>>>> 1.7.x msgid "Access denied." msgstr "" @@ -838,25 +758,16 @@ msgctxt "topicscmd" msgid "Topic" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:889 ClientCommand.cpp:894 -======= -#: ClientCommand.cpp:889 ClientCommand.cpp:893 ->>>>>>> 1.7.x msgctxt "listmods" msgid "Name" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:890 ClientCommand.cpp:895 -======= -#: ClientCommand.cpp:890 ClientCommand.cpp:894 ->>>>>>> 1.7.x msgctxt "listmods" msgid "Arguments" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:904 msgid "No global modules loaded." msgstr "" @@ -882,47 +793,15 @@ msgid "Network modules:" msgstr "" #: ClientCommand.cpp:942 ClientCommand.cpp:949 -======= -#: ClientCommand.cpp:902 -msgid "No global modules loaded." -msgstr "" - -#: ClientCommand.cpp:904 ClientCommand.cpp:964 -msgid "Global modules:" -msgstr "" - -#: ClientCommand.cpp:912 -msgid "Your user has no modules loaded." -msgstr "" - -#: ClientCommand.cpp:914 ClientCommand.cpp:975 -msgid "User modules:" -msgstr "" - -#: ClientCommand.cpp:921 -msgid "This network has no modules loaded." -msgstr "" - -#: ClientCommand.cpp:923 ClientCommand.cpp:986 -msgid "Network modules:" -msgstr "" - -#: ClientCommand.cpp:938 ClientCommand.cpp:944 ->>>>>>> 1.7.x msgctxt "listavailmods" msgid "Name" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:943 ClientCommand.cpp:954 -======= -#: ClientCommand.cpp:939 ClientCommand.cpp:949 ->>>>>>> 1.7.x msgctxt "listavailmods" msgid "Description" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:968 msgid "No global modules available." msgstr "" @@ -1032,132 +911,16 @@ msgid "Done" msgstr "" #: ClientCommand.cpp:1253 -======= -#: ClientCommand.cpp:962 -msgid "No global modules available." -msgstr "" - -#: ClientCommand.cpp:973 -msgid "No user modules available." -msgstr "" - -#: ClientCommand.cpp:984 -msgid "No network modules available." -msgstr "" - -#: ClientCommand.cpp:1012 -msgid "Unable to load {1}: Access denied." -msgstr "" - -#: ClientCommand.cpp:1018 -msgid "Usage: LoadMod [--type=global|user|network] [args]" -msgstr "" - -#: ClientCommand.cpp:1025 -msgid "Unable to load {1}: {2}" -msgstr "" - -#: ClientCommand.cpp:1035 -msgid "Unable to load global module {1}: Access denied." -msgstr "" - -#: ClientCommand.cpp:1041 -msgid "Unable to load network module {1}: Not connected with a network." -msgstr "" - -#: ClientCommand.cpp:1063 -msgid "Unknown module type" -msgstr "" - -#: ClientCommand.cpp:1068 -msgid "Loaded module {1}" -msgstr "" - -#: ClientCommand.cpp:1070 -msgid "Loaded module {1}: {2}" -msgstr "" - -#: ClientCommand.cpp:1073 -msgid "Unable to load module {1}: {2}" -msgstr "" - -#: ClientCommand.cpp:1096 -msgid "Unable to unload {1}: Access denied." -msgstr "" - -#: ClientCommand.cpp:1102 -msgid "Usage: UnloadMod [--type=global|user|network] " -msgstr "" - -#: ClientCommand.cpp:1111 -msgid "Unable to determine type of {1}: {2}" -msgstr "" - -#: ClientCommand.cpp:1119 -msgid "Unable to unload global module {1}: Access denied." -msgstr "" - -#: ClientCommand.cpp:1126 -msgid "Unable to unload network module {1}: Not connected with a network." -msgstr "" - -#: ClientCommand.cpp:1145 -msgid "Unable to unload module {1}: Unknown module type" -msgstr "" - -#: ClientCommand.cpp:1158 -msgid "Unable to reload modules. Access denied." -msgstr "" - -#: ClientCommand.cpp:1179 -msgid "Usage: ReloadMod [--type=global|user|network] [args]" -msgstr "" - -#: ClientCommand.cpp:1188 -msgid "Unable to reload {1}: {2}" -msgstr "" - -#: ClientCommand.cpp:1196 -msgid "Unable to reload global module {1}: Access denied." -msgstr "" - -#: ClientCommand.cpp:1203 -msgid "Unable to reload network module {1}: Not connected with a network." -msgstr "" - -#: ClientCommand.cpp:1225 -msgid "Unable to reload module {1}: Unknown module type" -msgstr "" - -#: ClientCommand.cpp:1236 -msgid "Usage: UpdateMod " -msgstr "" - -#: ClientCommand.cpp:1240 -msgid "Reloading {1} everywhere" -msgstr "" - -#: ClientCommand.cpp:1242 -msgid "Done" -msgstr "" - -#: ClientCommand.cpp:1245 ->>>>>>> 1.7.x msgid "" "Done, but there were errors, module {1} could not be reloaded everywhere." msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1261 -======= -#: ClientCommand.cpp:1253 ->>>>>>> 1.7.x msgid "" "You must be connected with a network to use this command. Try " "SetUserBindHost instead" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1268 msgid "Usage: SetBindHost " msgstr "" @@ -1179,35 +942,11 @@ msgid "Set default bind host to {1}" msgstr "" #: ClientCommand.cpp:1301 -======= -#: ClientCommand.cpp:1260 -msgid "Usage: SetBindHost " -msgstr "" - -#: ClientCommand.cpp:1265 ClientCommand.cpp:1282 -msgid "You already have this bind host!" -msgstr "" - -#: ClientCommand.cpp:1270 -msgid "Set bind host for network {1} to {2}" -msgstr "" - -#: ClientCommand.cpp:1277 -msgid "Usage: SetUserBindHost " -msgstr "" - -#: ClientCommand.cpp:1287 -msgid "Set default bind host to {1}" -msgstr "" - -#: ClientCommand.cpp:1293 ->>>>>>> 1.7.x msgid "" "You must be connected with a network to use this command. Try " "ClearUserBindHost instead" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1306 msgid "Bind host cleared for this network." msgstr "" @@ -1261,67 +1000,11 @@ msgid "Usage: ClearBuffer <#chan|query>" msgstr "" #: ClientCommand.cpp:1403 -======= -#: ClientCommand.cpp:1298 -msgid "Bind host cleared for this network." -msgstr "" - -#: ClientCommand.cpp:1302 -msgid "Default bind host cleared for your user." -msgstr "" - -#: ClientCommand.cpp:1305 -msgid "This user's default bind host not set" -msgstr "" - -#: ClientCommand.cpp:1307 -msgid "This user's default bind host is {1}" -msgstr "" - -#: ClientCommand.cpp:1312 -msgid "This network's bind host not set" -msgstr "" - -#: ClientCommand.cpp:1314 -msgid "This network's default bind host is {1}" -msgstr "" - -#: ClientCommand.cpp:1328 -msgid "Usage: PlayBuffer <#chan|query>" -msgstr "" - -#: ClientCommand.cpp:1336 -msgid "You are not on {1}" -msgstr "" - -#: ClientCommand.cpp:1341 -msgid "You are not on {1} (trying to join)" -msgstr "" - -#: ClientCommand.cpp:1346 -msgid "The buffer for channel {1} is empty" -msgstr "" - -#: ClientCommand.cpp:1355 -msgid "No active query with {1}" -msgstr "" - -#: ClientCommand.cpp:1360 -msgid "The buffer for {1} is empty" -msgstr "" - -#: ClientCommand.cpp:1376 -msgid "Usage: ClearBuffer <#chan|query>" -msgstr "" - -#: ClientCommand.cpp:1395 ->>>>>>> 1.7.x msgid "{1} buffer matching {2} has been cleared" msgid_plural "{1} buffers matching {2} have been cleared" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: ClientCommand.cpp:1416 msgid "All channel buffers have been cleared" msgstr "" @@ -1339,122 +1022,62 @@ msgid "Usage: SetBuffer <#chan|query> [linecount]" msgstr "" #: ClientCommand.cpp:1469 -======= -#: ClientCommand.cpp:1408 -msgid "All channel buffers have been cleared" -msgstr "" - -#: ClientCommand.cpp:1417 -msgid "All query buffers have been cleared" -msgstr "" - -#: ClientCommand.cpp:1429 -msgid "All buffers have been cleared" -msgstr "" - -#: ClientCommand.cpp:1440 -msgid "Usage: SetBuffer <#chan|query> [linecount]" -msgstr "" - -#: ClientCommand.cpp:1461 ->>>>>>> 1.7.x msgid "Setting buffer size failed for {1} buffer" msgid_plural "Setting buffer size failed for {1} buffers" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: ClientCommand.cpp:1472 -======= -#: ClientCommand.cpp:1464 ->>>>>>> 1.7.x msgid "Maximum buffer size is {1} line" msgid_plural "Maximum buffer size is {1} lines" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: ClientCommand.cpp:1477 -======= -#: ClientCommand.cpp:1469 ->>>>>>> 1.7.x msgid "Size of every buffer was set to {1} line" msgid_plural "Size of every buffer was set to {1} lines" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: ClientCommand.cpp:1487 ClientCommand.cpp:1494 ClientCommand.cpp:1505 #: ClientCommand.cpp:1514 ClientCommand.cpp:1522 -======= -#: ClientCommand.cpp:1479 ClientCommand.cpp:1486 ClientCommand.cpp:1497 -#: ClientCommand.cpp:1506 ClientCommand.cpp:1514 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "Username" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1488 ClientCommand.cpp:1495 ClientCommand.cpp:1507 #: ClientCommand.cpp:1516 ClientCommand.cpp:1524 -======= -#: ClientCommand.cpp:1480 ClientCommand.cpp:1487 ClientCommand.cpp:1499 -#: ClientCommand.cpp:1508 ClientCommand.cpp:1516 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "In" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1489 ClientCommand.cpp:1497 ClientCommand.cpp:1508 #: ClientCommand.cpp:1517 ClientCommand.cpp:1525 -======= -#: ClientCommand.cpp:1481 ClientCommand.cpp:1489 ClientCommand.cpp:1500 -#: ClientCommand.cpp:1509 ClientCommand.cpp:1517 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "Out" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1490 ClientCommand.cpp:1500 ClientCommand.cpp:1510 #: ClientCommand.cpp:1518 ClientCommand.cpp:1527 -======= -#: ClientCommand.cpp:1482 ClientCommand.cpp:1492 ClientCommand.cpp:1502 -#: ClientCommand.cpp:1510 ClientCommand.cpp:1519 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "Total" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1506 -======= -#: ClientCommand.cpp:1498 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1515 -======= -#: ClientCommand.cpp:1507 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1523 -======= -#: ClientCommand.cpp:1515 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1532 msgid "Running for {1}" msgstr "" @@ -1464,157 +1087,85 @@ msgid "Unknown command, try 'Help'" msgstr "" #: ClientCommand.cpp:1547 ClientCommand.cpp:1558 -======= -#: ClientCommand.cpp:1524 -msgid "Running for {1}" -msgstr "" - -#: ClientCommand.cpp:1530 -msgid "Unknown command, try 'Help'" -msgstr "" - -#: ClientCommand.cpp:1539 ClientCommand.cpp:1550 ->>>>>>> 1.7.x msgctxt "listports" msgid "Port" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1548 ClientCommand.cpp:1559 -======= -#: ClientCommand.cpp:1540 ClientCommand.cpp:1551 ->>>>>>> 1.7.x msgctxt "listports" msgid "BindHost" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1549 ClientCommand.cpp:1562 -======= -#: ClientCommand.cpp:1541 ClientCommand.cpp:1554 ->>>>>>> 1.7.x msgctxt "listports" msgid "SSL" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1550 ClientCommand.cpp:1567 -======= -#: ClientCommand.cpp:1542 ClientCommand.cpp:1559 ->>>>>>> 1.7.x msgctxt "listports" msgid "Protocol" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1551 ClientCommand.cpp:1574 -======= -#: ClientCommand.cpp:1543 ClientCommand.cpp:1566 ->>>>>>> 1.7.x msgctxt "listports" msgid "IRC" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1552 ClientCommand.cpp:1579 -======= -#: ClientCommand.cpp:1544 ClientCommand.cpp:1571 ->>>>>>> 1.7.x msgctxt "listports" msgid "Web" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1563 -======= -#: ClientCommand.cpp:1555 ->>>>>>> 1.7.x msgctxt "listports|ssl" msgid "yes" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1564 -======= -#: ClientCommand.cpp:1556 ->>>>>>> 1.7.x msgctxt "listports|ssl" msgid "no" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1568 -======= -#: ClientCommand.cpp:1560 ->>>>>>> 1.7.x msgctxt "listports" msgid "IPv4 and IPv6" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1570 -======= -#: ClientCommand.cpp:1562 ->>>>>>> 1.7.x msgctxt "listports" msgid "IPv4" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1571 -======= -#: ClientCommand.cpp:1563 ->>>>>>> 1.7.x msgctxt "listports" msgid "IPv6" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1577 -======= -#: ClientCommand.cpp:1569 ->>>>>>> 1.7.x msgctxt "listports|irc" msgid "yes" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1578 -======= -#: ClientCommand.cpp:1570 ->>>>>>> 1.7.x msgctxt "listports|irc" msgid "no" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1582 -======= -#: ClientCommand.cpp:1574 ->>>>>>> 1.7.x msgctxt "listports|irc" msgid "yes, on {1}" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1584 -======= -#: ClientCommand.cpp:1576 ->>>>>>> 1.7.x msgctxt "listports|web" msgid "no" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1624 -======= -#: ClientCommand.cpp:1616 ->>>>>>> 1.7.x msgid "" "Usage: AddPort <[+]port> [bindhost [uriprefix]]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1640 msgid "Port added" msgstr "" @@ -1636,865 +1187,474 @@ msgid "Unable to find a matching port" msgstr "" #: ClientCommand.cpp:1667 ClientCommand.cpp:1682 -======= -#: ClientCommand.cpp:1632 -msgid "Port added" -msgstr "" - -#: ClientCommand.cpp:1634 -msgid "Couldn't add port" -msgstr "" - -#: ClientCommand.cpp:1640 -msgid "Usage: DelPort [bindhost]" -msgstr "" - -#: ClientCommand.cpp:1649 -msgid "Deleted Port" -msgstr "" - -#: ClientCommand.cpp:1651 -msgid "Unable to find a matching port" -msgstr "" - -#: ClientCommand.cpp:1659 ClientCommand.cpp:1673 ->>>>>>> 1.7.x msgctxt "helpcmd" msgid "Command" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1668 ClientCommand.cpp:1684 -======= -#: ClientCommand.cpp:1660 ClientCommand.cpp:1674 ->>>>>>> 1.7.x msgctxt "helpcmd" msgid "Description" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1673 -======= -#: ClientCommand.cpp:1664 ->>>>>>> 1.7.x msgid "" "In the following list all occurrences of <#chan> support wildcards (* and ?) " "except ListNicks" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1690 -======= -#: ClientCommand.cpp:1680 ->>>>>>> 1.7.x msgctxt "helpcmd|Version|desc" msgid "Print which version of ZNC this is" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1693 -======= -#: ClientCommand.cpp:1683 ->>>>>>> 1.7.x msgctxt "helpcmd|ListMods|desc" msgid "List all loaded modules" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1696 -======= -#: ClientCommand.cpp:1686 ->>>>>>> 1.7.x msgctxt "helpcmd|ListAvailMods|desc" msgid "List all available modules" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1700 ClientCommand.cpp:1886 -======= -#: ClientCommand.cpp:1690 ClientCommand.cpp:1876 ->>>>>>> 1.7.x msgctxt "helpcmd|ListChans|desc" msgid "List all channels" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1703 -======= -#: ClientCommand.cpp:1693 ->>>>>>> 1.7.x msgctxt "helpcmd|ListNicks|args" msgid "<#chan>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1704 -======= -#: ClientCommand.cpp:1694 ->>>>>>> 1.7.x msgctxt "helpcmd|ListNicks|desc" msgid "List all nicks on a channel" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1707 -======= -#: ClientCommand.cpp:1697 ->>>>>>> 1.7.x msgctxt "helpcmd|ListClients|desc" msgid "List all clients connected to your ZNC user" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1711 -======= -#: ClientCommand.cpp:1701 ->>>>>>> 1.7.x msgctxt "helpcmd|ListServers|desc" msgid "List all servers of current IRC network" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1715 -======= -#: ClientCommand.cpp:1705 ->>>>>>> 1.7.x msgctxt "helpcmd|AddNetwork|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1716 -======= -#: ClientCommand.cpp:1706 ->>>>>>> 1.7.x msgctxt "helpcmd|AddNetwork|desc" msgid "Add a network to your user" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1718 -======= -#: ClientCommand.cpp:1708 ->>>>>>> 1.7.x msgctxt "helpcmd|DelNetwork|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1719 -======= -#: ClientCommand.cpp:1709 ->>>>>>> 1.7.x msgctxt "helpcmd|DelNetwork|desc" msgid "Delete a network from your user" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1721 -======= -#: ClientCommand.cpp:1711 ->>>>>>> 1.7.x msgctxt "helpcmd|ListNetworks|desc" msgid "List all networks" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1724 -======= -#: ClientCommand.cpp:1714 ->>>>>>> 1.7.x msgctxt "helpcmd|MoveNetwork|args" msgid " [new network]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1726 -======= -#: ClientCommand.cpp:1716 ->>>>>>> 1.7.x msgctxt "helpcmd|MoveNetwork|desc" msgid "Move an IRC network from one user to another" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1730 -======= -#: ClientCommand.cpp:1720 ->>>>>>> 1.7.x msgctxt "helpcmd|JumpNetwork|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1731 -======= -#: ClientCommand.cpp:1721 ->>>>>>> 1.7.x msgctxt "helpcmd|JumpNetwork|desc" msgid "" "Jump to another network (Alternatively, you can connect to ZNC several " "times, using `user/network` as username)" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1736 -======= -#: ClientCommand.cpp:1726 ->>>>>>> 1.7.x msgctxt "helpcmd|AddServer|args" msgid " [[+]port] [pass]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1737 -======= -#: ClientCommand.cpp:1727 ->>>>>>> 1.7.x msgctxt "helpcmd|AddServer|desc" msgid "" "Add a server to the list of alternate/backup servers of current IRC network." msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1741 -======= -#: ClientCommand.cpp:1731 ->>>>>>> 1.7.x msgctxt "helpcmd|DelServer|args" msgid " [port] [pass]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1742 -======= -#: ClientCommand.cpp:1732 ->>>>>>> 1.7.x msgctxt "helpcmd|DelServer|desc" msgid "" "Remove a server from the list of alternate/backup servers of current IRC " "network" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1748 -======= -#: ClientCommand.cpp:1738 ->>>>>>> 1.7.x msgctxt "helpcmd|AddTrustedServerFingerprint|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1749 -======= -#: ClientCommand.cpp:1739 ->>>>>>> 1.7.x msgctxt "helpcmd|AddTrustedServerFingerprint|desc" msgid "" "Add a trusted server SSL certificate fingerprint (SHA-256) to current IRC " "network." msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1754 -======= -#: ClientCommand.cpp:1744 ->>>>>>> 1.7.x msgctxt "helpcmd|DelTrustedServerFingerprint|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1755 -======= -#: ClientCommand.cpp:1745 ->>>>>>> 1.7.x msgctxt "helpcmd|DelTrustedServerFingerprint|desc" msgid "Delete a trusted server SSL certificate from current IRC network." msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1759 -======= -#: ClientCommand.cpp:1749 ->>>>>>> 1.7.x msgctxt "helpcmd|ListTrustedServerFingerprints|desc" msgid "List all trusted server SSL certificates of current IRC network." msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1762 -======= -#: ClientCommand.cpp:1752 ->>>>>>> 1.7.x msgctxt "helpcmd|EnableChan|args" msgid "<#chans>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1763 -======= -#: ClientCommand.cpp:1753 ->>>>>>> 1.7.x msgctxt "helpcmd|EnableChan|desc" msgid "Enable channels" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1764 -======= -#: ClientCommand.cpp:1754 ->>>>>>> 1.7.x msgctxt "helpcmd|DisableChan|args" msgid "<#chans>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1765 -======= -#: ClientCommand.cpp:1755 ->>>>>>> 1.7.x msgctxt "helpcmd|DisableChan|desc" msgid "Disable channels" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1766 -======= -#: ClientCommand.cpp:1756 ->>>>>>> 1.7.x msgctxt "helpcmd|Attach|args" msgid "<#chans>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1767 -======= -#: ClientCommand.cpp:1757 ->>>>>>> 1.7.x msgctxt "helpcmd|Attach|desc" msgid "Attach to channels" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1768 -======= -#: ClientCommand.cpp:1758 ->>>>>>> 1.7.x msgctxt "helpcmd|Detach|args" msgid "<#chans>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1769 -======= -#: ClientCommand.cpp:1759 ->>>>>>> 1.7.x msgctxt "helpcmd|Detach|desc" msgid "Detach from channels" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1772 -======= -#: ClientCommand.cpp:1762 ->>>>>>> 1.7.x msgctxt "helpcmd|Topics|desc" msgid "Show topics in all your channels" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1775 -======= -#: ClientCommand.cpp:1765 ->>>>>>> 1.7.x msgctxt "helpcmd|PlayBuffer|args" msgid "<#chan|query>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1776 -======= -#: ClientCommand.cpp:1766 ->>>>>>> 1.7.x msgctxt "helpcmd|PlayBuffer|desc" msgid "Play back the specified buffer" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1778 -======= -#: ClientCommand.cpp:1768 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearBuffer|args" msgid "<#chan|query>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1779 -======= -#: ClientCommand.cpp:1769 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearBuffer|desc" msgid "Clear the specified buffer" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1781 -======= -#: ClientCommand.cpp:1771 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearAllBuffers|desc" msgid "Clear all channel and query buffers" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1784 -======= -#: ClientCommand.cpp:1774 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearAllChannelBuffers|desc" msgid "Clear the channel buffers" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1788 -======= -#: ClientCommand.cpp:1778 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearAllQueryBuffers|desc" msgid "Clear the query buffers" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1790 -======= -#: ClientCommand.cpp:1780 ->>>>>>> 1.7.x msgctxt "helpcmd|SetBuffer|args" msgid "<#chan|query> [linecount]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1791 -======= -#: ClientCommand.cpp:1781 ->>>>>>> 1.7.x msgctxt "helpcmd|SetBuffer|desc" msgid "Set the buffer count" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1795 -======= -#: ClientCommand.cpp:1785 ->>>>>>> 1.7.x msgctxt "helpcmd|SetBindHost|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1796 -======= -#: ClientCommand.cpp:1786 ->>>>>>> 1.7.x msgctxt "helpcmd|SetBindHost|desc" msgid "Set the bind host for this network" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1800 -======= -#: ClientCommand.cpp:1790 ->>>>>>> 1.7.x msgctxt "helpcmd|SetUserBindHost|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1801 -======= -#: ClientCommand.cpp:1791 ->>>>>>> 1.7.x msgctxt "helpcmd|SetUserBindHost|desc" msgid "Set the default bind host for this user" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1804 -======= -#: ClientCommand.cpp:1794 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearBindHost|desc" msgid "Clear the bind host for this network" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1807 -======= -#: ClientCommand.cpp:1797 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearUserBindHost|desc" msgid "Clear the default bind host for this user" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1813 -======= -#: ClientCommand.cpp:1803 ->>>>>>> 1.7.x msgctxt "helpcmd|ShowBindHost|desc" msgid "Show currently selected bind host" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1815 -======= -#: ClientCommand.cpp:1805 ->>>>>>> 1.7.x msgctxt "helpcmd|Jump|args" msgid "[server]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1816 -======= -#: ClientCommand.cpp:1806 ->>>>>>> 1.7.x msgctxt "helpcmd|Jump|desc" msgid "Jump to the next or the specified server" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1817 -======= -#: ClientCommand.cpp:1807 ->>>>>>> 1.7.x msgctxt "helpcmd|Disconnect|args" msgid "[message]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1818 -======= -#: ClientCommand.cpp:1808 ->>>>>>> 1.7.x msgctxt "helpcmd|Disconnect|desc" msgid "Disconnect from IRC" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1820 -======= -#: ClientCommand.cpp:1810 ->>>>>>> 1.7.x msgctxt "helpcmd|Connect|desc" msgid "Reconnect to IRC" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1823 -======= -#: ClientCommand.cpp:1813 ->>>>>>> 1.7.x msgctxt "helpcmd|Uptime|desc" msgid "Show for how long ZNC has been running" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1827 -======= -#: ClientCommand.cpp:1817 ->>>>>>> 1.7.x msgctxt "helpcmd|LoadMod|args" msgid "[--type=global|user|network] " msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1829 -======= -#: ClientCommand.cpp:1819 ->>>>>>> 1.7.x msgctxt "helpcmd|LoadMod|desc" msgid "Load a module" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1831 -======= -#: ClientCommand.cpp:1821 ->>>>>>> 1.7.x msgctxt "helpcmd|UnloadMod|args" msgid "[--type=global|user|network] " msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1833 -======= -#: ClientCommand.cpp:1823 ->>>>>>> 1.7.x msgctxt "helpcmd|UnloadMod|desc" msgid "Unload a module" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1835 -======= -#: ClientCommand.cpp:1825 ->>>>>>> 1.7.x msgctxt "helpcmd|ReloadMod|args" msgid "[--type=global|user|network] " msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1837 -======= -#: ClientCommand.cpp:1827 ->>>>>>> 1.7.x msgctxt "helpcmd|ReloadMod|desc" msgid "Reload a module" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1840 -======= -#: ClientCommand.cpp:1830 ->>>>>>> 1.7.x msgctxt "helpcmd|UpdateMod|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1841 -======= -#: ClientCommand.cpp:1831 ->>>>>>> 1.7.x msgctxt "helpcmd|UpdateMod|desc" msgid "Reload a module everywhere" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1847 -======= -#: ClientCommand.cpp:1837 ->>>>>>> 1.7.x msgctxt "helpcmd|ShowMOTD|desc" msgid "Show ZNC's message of the day" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1851 -======= -#: ClientCommand.cpp:1841 ->>>>>>> 1.7.x msgctxt "helpcmd|SetMOTD|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1852 -======= -#: ClientCommand.cpp:1842 ->>>>>>> 1.7.x msgctxt "helpcmd|SetMOTD|desc" msgid "Set ZNC's message of the day" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1854 -======= -#: ClientCommand.cpp:1844 ->>>>>>> 1.7.x msgctxt "helpcmd|AddMOTD|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1855 -======= -#: ClientCommand.cpp:1845 ->>>>>>> 1.7.x msgctxt "helpcmd|AddMOTD|desc" msgid "Append to ZNC's MOTD" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1857 -======= -#: ClientCommand.cpp:1847 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearMOTD|desc" msgid "Clear ZNC's MOTD" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1860 -======= -#: ClientCommand.cpp:1850 ->>>>>>> 1.7.x msgctxt "helpcmd|ListPorts|desc" msgid "Show all active listeners" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1862 -======= -#: ClientCommand.cpp:1852 ->>>>>>> 1.7.x msgctxt "helpcmd|AddPort|args" msgid "<[+]port> [bindhost [uriprefix]]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1865 -======= -#: ClientCommand.cpp:1855 ->>>>>>> 1.7.x msgctxt "helpcmd|AddPort|desc" msgid "Add another port for ZNC to listen on" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1869 -======= -#: ClientCommand.cpp:1859 ->>>>>>> 1.7.x msgctxt "helpcmd|DelPort|args" msgid " [bindhost]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1870 -======= -#: ClientCommand.cpp:1860 ->>>>>>> 1.7.x msgctxt "helpcmd|DelPort|desc" msgid "Remove a port from ZNC" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1873 -======= -#: ClientCommand.cpp:1863 ->>>>>>> 1.7.x msgctxt "helpcmd|Rehash|desc" msgid "Reload global settings, modules, and listeners from znc.conf" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1876 -======= -#: ClientCommand.cpp:1866 ->>>>>>> 1.7.x msgctxt "helpcmd|SaveConfig|desc" msgid "Save the current settings to disk" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1879 -======= -#: ClientCommand.cpp:1869 ->>>>>>> 1.7.x msgctxt "helpcmd|ListUsers|desc" msgid "List all ZNC users and their connection status" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1882 -======= -#: ClientCommand.cpp:1872 ->>>>>>> 1.7.x msgctxt "helpcmd|ListAllUserNetworks|desc" msgid "List all ZNC users and their networks" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1885 -======= -#: ClientCommand.cpp:1875 ->>>>>>> 1.7.x msgctxt "helpcmd|ListChans|args" msgid "[user ]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1888 -======= -#: ClientCommand.cpp:1878 ->>>>>>> 1.7.x msgctxt "helpcmd|ListClients|args" msgid "[user]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1889 -======= -#: ClientCommand.cpp:1879 ->>>>>>> 1.7.x msgctxt "helpcmd|ListClients|desc" msgid "List all connected clients" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1891 -======= -#: ClientCommand.cpp:1881 ->>>>>>> 1.7.x msgctxt "helpcmd|Traffic|desc" msgid "Show basic traffic stats for all ZNC users" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1893 -======= -#: ClientCommand.cpp:1883 ->>>>>>> 1.7.x msgctxt "helpcmd|Broadcast|args" msgid "[message]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1894 -======= -#: ClientCommand.cpp:1884 ->>>>>>> 1.7.x msgctxt "helpcmd|Broadcast|desc" msgid "Broadcast a message to all ZNC users" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1897 -======= -#: ClientCommand.cpp:1887 ->>>>>>> 1.7.x msgctxt "helpcmd|Shutdown|args" msgid "[message]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1898 -======= -#: ClientCommand.cpp:1888 ->>>>>>> 1.7.x msgctxt "helpcmd|Shutdown|desc" msgid "Shut down ZNC completely" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1899 -======= -#: ClientCommand.cpp:1889 ->>>>>>> 1.7.x msgctxt "helpcmd|Restart|args" msgid "[message]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1900 -======= -#: ClientCommand.cpp:1890 ->>>>>>> 1.7.x msgctxt "helpcmd|Restart|desc" msgid "Restart ZNC" msgstr "" @@ -2521,7 +1681,6 @@ msgstr "" msgid "Some socket reached its max buffer limit and was closed!" msgstr "" -<<<<<<< HEAD #: SSLVerifyHost.cpp:481 msgid "hostname doesn't match" msgstr "" @@ -2531,17 +1690,6 @@ msgid "malformed hostname in certificate" msgstr "" #: SSLVerifyHost.cpp:489 -======= -#: SSLVerifyHost.cpp:448 -msgid "hostname doesn't match" -msgstr "" - -#: SSLVerifyHost.cpp:452 -msgid "malformed hostname in certificate" -msgstr "" - -#: SSLVerifyHost.cpp:456 ->>>>>>> 1.7.x msgid "hostname verification error" msgstr "" @@ -2561,7 +1709,6 @@ msgid "" "to this user" msgstr "" -<<<<<<< HEAD #: User.cpp:912 msgid "Password is empty" msgstr "" @@ -2575,20 +1722,5 @@ msgid "Username is invalid" msgstr "" #: User.cpp:1199 -======= -#: User.cpp:907 -msgid "Password is empty" -msgstr "" - -#: User.cpp:912 -msgid "Username is empty" -msgstr "" - -#: User.cpp:917 -msgid "Username is invalid" -msgstr "" - -#: User.cpp:1188 ->>>>>>> 1.7.x msgid "Unable to find modinfo {1}: {2}" msgstr "" diff --git a/src/po/znc.de_DE.po b/src/po/znc.de_DE.po index 319c0c25..da5ea106 100644 --- a/src/po/znc.de_DE.po +++ b/src/po/znc.de_DE.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: de\n" "X-Crowdin-File: /master/src/po/znc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: German\n" "Language: de_DE\n" @@ -415,20 +411,12 @@ msgstr "" "Modul {1} ist inkompatibel gebaut: Kern ist '{2}', Modul ist '{3}'. Baue das " "Modul neu." -<<<<<<< HEAD #: Modules.cpp:2023 Modules.cpp:2029 -======= -#: Modules.cpp:2022 Modules.cpp:2028 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Command" msgstr "Befehl" -<<<<<<< HEAD #: Modules.cpp:2024 Modules.cpp:2031 -======= -#: Modules.cpp:2023 Modules.cpp:2029 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Description" msgstr "Beschreibung" diff --git a/src/po/znc.es_ES.po b/src/po/znc.es_ES.po index bc056c7b..d9069c3e 100644 --- a/src/po/znc.es_ES.po +++ b/src/po/znc.es_ES.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: es-ES\n" "X-Crowdin-File: /master/src/po/znc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Spanish\n" "Language: es_ES\n" @@ -403,20 +399,12 @@ msgstr "" "El módulo {1} es incompatible: el núcleo es '{2}', el módulo es '{3}'. " "Recompila este módulo." -<<<<<<< HEAD #: Modules.cpp:2023 Modules.cpp:2029 -======= -#: Modules.cpp:2022 Modules.cpp:2028 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Command" msgstr "Comando" -<<<<<<< HEAD #: Modules.cpp:2024 Modules.cpp:2031 -======= -#: Modules.cpp:2023 Modules.cpp:2029 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Description" msgstr "Descripción" diff --git a/src/po/znc.fr_FR.po b/src/po/znc.fr_FR.po index 552fce68..ee381cf4 100644 --- a/src/po/znc.fr_FR.po +++ b/src/po/znc.fr_FR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: fr\n" "X-Crowdin-File: /master/src/po/znc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: French\n" "Language: fr_FR\n" @@ -412,20 +408,12 @@ msgstr "" "Le module {1} a été compilé de façon incompatible : le cœur est '{2}', le " "module est '{3}'. Recompilez ce module." -<<<<<<< HEAD #: Modules.cpp:2023 Modules.cpp:2029 -======= -#: Modules.cpp:2022 Modules.cpp:2028 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Command" msgstr "Commande" -<<<<<<< HEAD #: Modules.cpp:2024 Modules.cpp:2031 -======= -#: Modules.cpp:2023 Modules.cpp:2029 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Description" msgstr "Description" diff --git a/src/po/znc.id_ID.po b/src/po/znc.id_ID.po index fbc26ba7..f62658a2 100644 --- a/src/po/znc.id_ID.po +++ b/src/po/znc.id_ID.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: id\n" "X-Crowdin-File: /master/src/po/znc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Indonesian\n" "Language: id_ID\n" @@ -394,20 +390,12 @@ msgid "" "this module." msgstr "" -<<<<<<< HEAD #: Modules.cpp:2023 Modules.cpp:2029 -======= -#: Modules.cpp:2022 Modules.cpp:2028 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Command" msgstr "" -<<<<<<< HEAD #: Modules.cpp:2024 Modules.cpp:2031 -======= -#: Modules.cpp:2023 Modules.cpp:2029 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Description" msgstr "" diff --git a/src/po/znc.it_IT.po b/src/po/znc.it_IT.po index 95eb7f3e..3ea3caf4 100644 --- a/src/po/znc.it_IT.po +++ b/src/po/znc.it_IT.po @@ -6,15 +6,9 @@ msgstr "" "X-Generator: crowdin.com\n" "X-Crowdin-Project: znc-bouncer\n" "X-Crowdin-Language: it\n" -<<<<<<< HEAD "X-Crowdin-File: /master/src/po/znc.pot\n" "Project-Id-Version: znc-bouncer\n" "Last-Translator: Various people\n" -======= -"X-Crowdin-File: /1.7.x/src/po/znc.pot\n" -"Project-Id-Version: znc-bouncer\n" -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Italian\n" "Language: it_IT\n" @@ -57,7 +51,6 @@ msgid "" "code>”). Once you have loaded some Web-enabled modules, the menu will expand." msgstr "" -<<<<<<< HEAD #: znc.cpp:1562 msgid "User already exists" msgstr "Utente già esistente" @@ -79,29 +72,6 @@ msgid "Invalid port" msgstr "Porta non valida" #: znc.cpp:1821 ClientCommand.cpp:1637 -======= -#: znc.cpp:1563 -msgid "User already exists" -msgstr "Utente già esistente" - -#: znc.cpp:1671 -msgid "IPv6 is not enabled" -msgstr "IPv6 non è abilitato" - -#: znc.cpp:1679 -msgid "SSL is not enabled" -msgstr "SSL non è abilitato" - -#: znc.cpp:1687 -msgid "Unable to locate pem file: {1}" -msgstr "" - -#: znc.cpp:1706 -msgid "Invalid port" -msgstr "Porta non valida" - -#: znc.cpp:1822 ClientCommand.cpp:1629 ->>>>>>> 1.7.x msgid "Unable to bind: {1}" msgstr "" @@ -109,7 +79,6 @@ msgstr "" msgid "Jumping servers because this server is no longer in the list" msgstr "" -<<<<<<< HEAD #: IRCNetwork.cpp:669 User.cpp:678 msgid "Welcome to ZNC" msgstr "" @@ -135,33 +104,6 @@ msgid "Cannot connect to {1}, because ZNC is not compiled with SSL support." msgstr "" #: IRCNetwork.cpp:1329 -======= -#: IRCNetwork.cpp:640 User.cpp:678 -msgid "Welcome to ZNC" -msgstr "" - -#: IRCNetwork.cpp:728 -msgid "You are currently disconnected from IRC. Use 'connect' to reconnect." -msgstr "" - -#: IRCNetwork.cpp:758 -msgid "This network is being deleted or moved to another user." -msgstr "" - -#: IRCNetwork.cpp:987 -msgid "The channel {1} could not be joined, disabling it." -msgstr "" - -#: IRCNetwork.cpp:1116 -msgid "Your current server was removed, jumping..." -msgstr "" - -#: IRCNetwork.cpp:1279 -msgid "Cannot connect to {1}, because ZNC is not compiled with SSL support." -msgstr "" - -#: IRCNetwork.cpp:1300 ->>>>>>> 1.7.x msgid "Some module aborted the connection attempt" msgstr "" @@ -341,11 +283,7 @@ msgctxt "modhelpcmd" msgid "Generate this output" msgstr "" -<<<<<<< HEAD #: Modules.cpp:573 ClientCommand.cpp:1904 -======= -#: Modules.cpp:573 ClientCommand.cpp:1894 ->>>>>>> 1.7.x msgid "No matches for '{1}'" msgstr "" @@ -439,20 +377,12 @@ msgid "" "this module." msgstr "" -<<<<<<< HEAD #: Modules.cpp:2023 Modules.cpp:2029 -======= -#: Modules.cpp:2022 Modules.cpp:2028 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Command" msgstr "Comando" -<<<<<<< HEAD #: Modules.cpp:2024 Modules.cpp:2031 -======= -#: Modules.cpp:2023 Modules.cpp:2029 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Description" msgstr "Descrizione" @@ -460,15 +390,9 @@ msgstr "Descrizione" #: ClientCommand.cpp:51 ClientCommand.cpp:115 ClientCommand.cpp:137 #: ClientCommand.cpp:749 ClientCommand.cpp:768 ClientCommand.cpp:794 #: ClientCommand.cpp:827 ClientCommand.cpp:840 ClientCommand.cpp:853 -<<<<<<< HEAD #: ClientCommand.cpp:868 ClientCommand.cpp:1329 ClientCommand.cpp:1377 #: ClientCommand.cpp:1409 ClientCommand.cpp:1420 ClientCommand.cpp:1429 #: ClientCommand.cpp:1441 -======= -#: ClientCommand.cpp:868 ClientCommand.cpp:1321 ClientCommand.cpp:1369 -#: ClientCommand.cpp:1401 ClientCommand.cpp:1412 ClientCommand.cpp:1421 -#: ClientCommand.cpp:1433 ->>>>>>> 1.7.x msgid "You must be connected with a network to use this command" msgstr "" @@ -688,11 +612,7 @@ msgctxt "listnetworks" msgid "No networks" msgstr "Nessuna rete" -<<<<<<< HEAD #: ClientCommand.cpp:632 ClientCommand.cpp:936 -======= -#: ClientCommand.cpp:632 ClientCommand.cpp:932 ->>>>>>> 1.7.x msgid "Access denied." msgstr "Accesso negato." @@ -838,25 +758,16 @@ msgctxt "topicscmd" msgid "Topic" msgstr "Topic" -<<<<<<< HEAD #: ClientCommand.cpp:889 ClientCommand.cpp:894 -======= -#: ClientCommand.cpp:889 ClientCommand.cpp:893 ->>>>>>> 1.7.x msgctxt "listmods" msgid "Name" msgstr "Nome" -<<<<<<< HEAD #: ClientCommand.cpp:890 ClientCommand.cpp:895 -======= -#: ClientCommand.cpp:890 ClientCommand.cpp:894 ->>>>>>> 1.7.x msgctxt "listmods" msgid "Arguments" msgstr "Parametri" -<<<<<<< HEAD #: ClientCommand.cpp:904 msgid "No global modules loaded." msgstr "" @@ -882,47 +793,15 @@ msgid "Network modules:" msgstr "" #: ClientCommand.cpp:942 ClientCommand.cpp:949 -======= -#: ClientCommand.cpp:902 -msgid "No global modules loaded." -msgstr "" - -#: ClientCommand.cpp:904 ClientCommand.cpp:964 -msgid "Global modules:" -msgstr "Moduli Globali:" - -#: ClientCommand.cpp:912 -msgid "Your user has no modules loaded." -msgstr "" - -#: ClientCommand.cpp:914 ClientCommand.cpp:975 -msgid "User modules:" -msgstr "Moduli Utente:" - -#: ClientCommand.cpp:921 -msgid "This network has no modules loaded." -msgstr "" - -#: ClientCommand.cpp:923 ClientCommand.cpp:986 -msgid "Network modules:" -msgstr "" - -#: ClientCommand.cpp:938 ClientCommand.cpp:944 ->>>>>>> 1.7.x msgctxt "listavailmods" msgid "Name" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:943 ClientCommand.cpp:954 -======= -#: ClientCommand.cpp:939 ClientCommand.cpp:949 ->>>>>>> 1.7.x msgctxt "listavailmods" msgid "Description" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:968 msgid "No global modules available." msgstr "" @@ -1032,132 +911,16 @@ msgid "Done" msgstr "Fatto" #: ClientCommand.cpp:1253 -======= -#: ClientCommand.cpp:962 -msgid "No global modules available." -msgstr "" - -#: ClientCommand.cpp:973 -msgid "No user modules available." -msgstr "" - -#: ClientCommand.cpp:984 -msgid "No network modules available." -msgstr "" - -#: ClientCommand.cpp:1012 -msgid "Unable to load {1}: Access denied." -msgstr "" - -#: ClientCommand.cpp:1018 -msgid "Usage: LoadMod [--type=global|user|network] [args]" -msgstr "" - -#: ClientCommand.cpp:1025 -msgid "Unable to load {1}: {2}" -msgstr "" - -#: ClientCommand.cpp:1035 -msgid "Unable to load global module {1}: Access denied." -msgstr "" - -#: ClientCommand.cpp:1041 -msgid "Unable to load network module {1}: Not connected with a network." -msgstr "" - -#: ClientCommand.cpp:1063 -msgid "Unknown module type" -msgstr "" - -#: ClientCommand.cpp:1068 -msgid "Loaded module {1}" -msgstr "" - -#: ClientCommand.cpp:1070 -msgid "Loaded module {1}: {2}" -msgstr "" - -#: ClientCommand.cpp:1073 -msgid "Unable to load module {1}: {2}" -msgstr "" - -#: ClientCommand.cpp:1096 -msgid "Unable to unload {1}: Access denied." -msgstr "" - -#: ClientCommand.cpp:1102 -msgid "Usage: UnloadMod [--type=global|user|network] " -msgstr "" - -#: ClientCommand.cpp:1111 -msgid "Unable to determine type of {1}: {2}" -msgstr "" - -#: ClientCommand.cpp:1119 -msgid "Unable to unload global module {1}: Access denied." -msgstr "" - -#: ClientCommand.cpp:1126 -msgid "Unable to unload network module {1}: Not connected with a network." -msgstr "" - -#: ClientCommand.cpp:1145 -msgid "Unable to unload module {1}: Unknown module type" -msgstr "" - -#: ClientCommand.cpp:1158 -msgid "Unable to reload modules. Access denied." -msgstr "" - -#: ClientCommand.cpp:1179 -msgid "Usage: ReloadMod [--type=global|user|network] [args]" -msgstr "" - -#: ClientCommand.cpp:1188 -msgid "Unable to reload {1}: {2}" -msgstr "" - -#: ClientCommand.cpp:1196 -msgid "Unable to reload global module {1}: Access denied." -msgstr "" - -#: ClientCommand.cpp:1203 -msgid "Unable to reload network module {1}: Not connected with a network." -msgstr "" - -#: ClientCommand.cpp:1225 -msgid "Unable to reload module {1}: Unknown module type" -msgstr "" - -#: ClientCommand.cpp:1236 -msgid "Usage: UpdateMod " -msgstr "" - -#: ClientCommand.cpp:1240 -msgid "Reloading {1} everywhere" -msgstr "" - -#: ClientCommand.cpp:1242 -msgid "Done" -msgstr "Fatto" - -#: ClientCommand.cpp:1245 ->>>>>>> 1.7.x msgid "" "Done, but there were errors, module {1} could not be reloaded everywhere." msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1261 -======= -#: ClientCommand.cpp:1253 ->>>>>>> 1.7.x msgid "" "You must be connected with a network to use this command. Try " "SetUserBindHost instead" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1268 msgid "Usage: SetBindHost " msgstr "" @@ -1179,35 +942,11 @@ msgid "Set default bind host to {1}" msgstr "" #: ClientCommand.cpp:1301 -======= -#: ClientCommand.cpp:1260 -msgid "Usage: SetBindHost " -msgstr "" - -#: ClientCommand.cpp:1265 ClientCommand.cpp:1282 -msgid "You already have this bind host!" -msgstr "" - -#: ClientCommand.cpp:1270 -msgid "Set bind host for network {1} to {2}" -msgstr "" - -#: ClientCommand.cpp:1277 -msgid "Usage: SetUserBindHost " -msgstr "" - -#: ClientCommand.cpp:1287 -msgid "Set default bind host to {1}" -msgstr "" - -#: ClientCommand.cpp:1293 ->>>>>>> 1.7.x msgid "" "You must be connected with a network to use this command. Try " "ClearUserBindHost instead" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1306 msgid "Bind host cleared for this network." msgstr "" @@ -1261,67 +1000,11 @@ msgid "Usage: ClearBuffer <#chan|query>" msgstr "" #: ClientCommand.cpp:1403 -======= -#: ClientCommand.cpp:1298 -msgid "Bind host cleared for this network." -msgstr "" - -#: ClientCommand.cpp:1302 -msgid "Default bind host cleared for your user." -msgstr "" - -#: ClientCommand.cpp:1305 -msgid "This user's default bind host not set" -msgstr "" - -#: ClientCommand.cpp:1307 -msgid "This user's default bind host is {1}" -msgstr "" - -#: ClientCommand.cpp:1312 -msgid "This network's bind host not set" -msgstr "" - -#: ClientCommand.cpp:1314 -msgid "This network's default bind host is {1}" -msgstr "" - -#: ClientCommand.cpp:1328 -msgid "Usage: PlayBuffer <#chan|query>" -msgstr "" - -#: ClientCommand.cpp:1336 -msgid "You are not on {1}" -msgstr "" - -#: ClientCommand.cpp:1341 -msgid "You are not on {1} (trying to join)" -msgstr "" - -#: ClientCommand.cpp:1346 -msgid "The buffer for channel {1} is empty" -msgstr "" - -#: ClientCommand.cpp:1355 -msgid "No active query with {1}" -msgstr "" - -#: ClientCommand.cpp:1360 -msgid "The buffer for {1} is empty" -msgstr "" - -#: ClientCommand.cpp:1376 -msgid "Usage: ClearBuffer <#chan|query>" -msgstr "" - -#: ClientCommand.cpp:1395 ->>>>>>> 1.7.x msgid "{1} buffer matching {2} has been cleared" msgid_plural "{1} buffers matching {2} have been cleared" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: ClientCommand.cpp:1416 msgid "All channel buffers have been cleared" msgstr "" @@ -1339,122 +1022,62 @@ msgid "Usage: SetBuffer <#chan|query> [linecount]" msgstr "" #: ClientCommand.cpp:1469 -======= -#: ClientCommand.cpp:1408 -msgid "All channel buffers have been cleared" -msgstr "" - -#: ClientCommand.cpp:1417 -msgid "All query buffers have been cleared" -msgstr "" - -#: ClientCommand.cpp:1429 -msgid "All buffers have been cleared" -msgstr "" - -#: ClientCommand.cpp:1440 -msgid "Usage: SetBuffer <#chan|query> [linecount]" -msgstr "" - -#: ClientCommand.cpp:1461 ->>>>>>> 1.7.x msgid "Setting buffer size failed for {1} buffer" msgid_plural "Setting buffer size failed for {1} buffers" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: ClientCommand.cpp:1472 -======= -#: ClientCommand.cpp:1464 ->>>>>>> 1.7.x msgid "Maximum buffer size is {1} line" msgid_plural "Maximum buffer size is {1} lines" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: ClientCommand.cpp:1477 -======= -#: ClientCommand.cpp:1469 ->>>>>>> 1.7.x msgid "Size of every buffer was set to {1} line" msgid_plural "Size of every buffer was set to {1} lines" msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD #: ClientCommand.cpp:1487 ClientCommand.cpp:1494 ClientCommand.cpp:1505 #: ClientCommand.cpp:1514 ClientCommand.cpp:1522 -======= -#: ClientCommand.cpp:1479 ClientCommand.cpp:1486 ClientCommand.cpp:1497 -#: ClientCommand.cpp:1506 ClientCommand.cpp:1514 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "Username" msgstr "Nome Utente" -<<<<<<< HEAD #: ClientCommand.cpp:1488 ClientCommand.cpp:1495 ClientCommand.cpp:1507 #: ClientCommand.cpp:1516 ClientCommand.cpp:1524 -======= -#: ClientCommand.cpp:1480 ClientCommand.cpp:1487 ClientCommand.cpp:1499 -#: ClientCommand.cpp:1508 ClientCommand.cpp:1516 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "In" msgstr "In" -<<<<<<< HEAD #: ClientCommand.cpp:1489 ClientCommand.cpp:1497 ClientCommand.cpp:1508 #: ClientCommand.cpp:1517 ClientCommand.cpp:1525 -======= -#: ClientCommand.cpp:1481 ClientCommand.cpp:1489 ClientCommand.cpp:1500 -#: ClientCommand.cpp:1509 ClientCommand.cpp:1517 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "Out" msgstr "Out" -<<<<<<< HEAD #: ClientCommand.cpp:1490 ClientCommand.cpp:1500 ClientCommand.cpp:1510 #: ClientCommand.cpp:1518 ClientCommand.cpp:1527 -======= -#: ClientCommand.cpp:1482 ClientCommand.cpp:1492 ClientCommand.cpp:1502 -#: ClientCommand.cpp:1510 ClientCommand.cpp:1519 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "Total" msgstr "Totale" -<<<<<<< HEAD #: ClientCommand.cpp:1506 -======= -#: ClientCommand.cpp:1498 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1515 -======= -#: ClientCommand.cpp:1507 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1523 -======= -#: ClientCommand.cpp:1515 ->>>>>>> 1.7.x msgctxt "trafficcmd" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1532 msgid "Running for {1}" msgstr "" @@ -1464,157 +1087,85 @@ msgid "Unknown command, try 'Help'" msgstr "" #: ClientCommand.cpp:1547 ClientCommand.cpp:1558 -======= -#: ClientCommand.cpp:1524 -msgid "Running for {1}" -msgstr "" - -#: ClientCommand.cpp:1530 -msgid "Unknown command, try 'Help'" -msgstr "" - -#: ClientCommand.cpp:1539 ClientCommand.cpp:1550 ->>>>>>> 1.7.x msgctxt "listports" msgid "Port" msgstr "Porta" -<<<<<<< HEAD #: ClientCommand.cpp:1548 ClientCommand.cpp:1559 -======= -#: ClientCommand.cpp:1540 ClientCommand.cpp:1551 ->>>>>>> 1.7.x msgctxt "listports" msgid "BindHost" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1549 ClientCommand.cpp:1562 -======= -#: ClientCommand.cpp:1541 ClientCommand.cpp:1554 ->>>>>>> 1.7.x msgctxt "listports" msgid "SSL" msgstr "SSL" -<<<<<<< HEAD #: ClientCommand.cpp:1550 ClientCommand.cpp:1567 -======= -#: ClientCommand.cpp:1542 ClientCommand.cpp:1559 ->>>>>>> 1.7.x msgctxt "listports" msgid "Protocol" msgstr "Protocollo" -<<<<<<< HEAD #: ClientCommand.cpp:1551 ClientCommand.cpp:1574 -======= -#: ClientCommand.cpp:1543 ClientCommand.cpp:1566 ->>>>>>> 1.7.x msgctxt "listports" msgid "IRC" msgstr "IRC" -<<<<<<< HEAD #: ClientCommand.cpp:1552 ClientCommand.cpp:1579 -======= -#: ClientCommand.cpp:1544 ClientCommand.cpp:1571 ->>>>>>> 1.7.x msgctxt "listports" msgid "Web" msgstr "Web" -<<<<<<< HEAD #: ClientCommand.cpp:1563 -======= -#: ClientCommand.cpp:1555 ->>>>>>> 1.7.x msgctxt "listports|ssl" msgid "yes" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1564 -======= -#: ClientCommand.cpp:1556 ->>>>>>> 1.7.x msgctxt "listports|ssl" msgid "no" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1568 -======= -#: ClientCommand.cpp:1560 ->>>>>>> 1.7.x msgctxt "listports" msgid "IPv4 and IPv6" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1570 -======= -#: ClientCommand.cpp:1562 ->>>>>>> 1.7.x msgctxt "listports" msgid "IPv4" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1571 -======= -#: ClientCommand.cpp:1563 ->>>>>>> 1.7.x msgctxt "listports" msgid "IPv6" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1577 -======= -#: ClientCommand.cpp:1569 ->>>>>>> 1.7.x msgctxt "listports|irc" msgid "yes" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1578 -======= -#: ClientCommand.cpp:1570 ->>>>>>> 1.7.x msgctxt "listports|irc" msgid "no" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1582 -======= -#: ClientCommand.cpp:1574 ->>>>>>> 1.7.x msgctxt "listports|irc" msgid "yes, on {1}" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1584 -======= -#: ClientCommand.cpp:1576 ->>>>>>> 1.7.x msgctxt "listports|web" msgid "no" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1624 -======= -#: ClientCommand.cpp:1616 ->>>>>>> 1.7.x msgid "" "Usage: AddPort <[+]port> [bindhost [uriprefix]]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1640 msgid "Port added" msgstr "Porta aggiunta" @@ -1636,865 +1187,474 @@ msgid "Unable to find a matching port" msgstr "" #: ClientCommand.cpp:1667 ClientCommand.cpp:1682 -======= -#: ClientCommand.cpp:1632 -msgid "Port added" -msgstr "Porta aggiunta" - -#: ClientCommand.cpp:1634 -msgid "Couldn't add port" -msgstr "Impossibile aggiungere la porta" - -#: ClientCommand.cpp:1640 -msgid "Usage: DelPort [bindhost]" -msgstr "" - -#: ClientCommand.cpp:1649 -msgid "Deleted Port" -msgstr "" - -#: ClientCommand.cpp:1651 -msgid "Unable to find a matching port" -msgstr "" - -#: ClientCommand.cpp:1659 ClientCommand.cpp:1673 ->>>>>>> 1.7.x msgctxt "helpcmd" msgid "Command" msgstr "Comando" -<<<<<<< HEAD #: ClientCommand.cpp:1668 ClientCommand.cpp:1684 -======= -#: ClientCommand.cpp:1660 ClientCommand.cpp:1674 ->>>>>>> 1.7.x msgctxt "helpcmd" msgid "Description" msgstr "Descrizione" -<<<<<<< HEAD #: ClientCommand.cpp:1673 -======= -#: ClientCommand.cpp:1664 ->>>>>>> 1.7.x msgid "" "In the following list all occurrences of <#chan> support wildcards (* and ?) " "except ListNicks" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1690 -======= -#: ClientCommand.cpp:1680 ->>>>>>> 1.7.x msgctxt "helpcmd|Version|desc" msgid "Print which version of ZNC this is" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1693 -======= -#: ClientCommand.cpp:1683 ->>>>>>> 1.7.x msgctxt "helpcmd|ListMods|desc" msgid "List all loaded modules" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1696 -======= -#: ClientCommand.cpp:1686 ->>>>>>> 1.7.x msgctxt "helpcmd|ListAvailMods|desc" msgid "List all available modules" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1700 ClientCommand.cpp:1886 -======= -#: ClientCommand.cpp:1690 ClientCommand.cpp:1876 ->>>>>>> 1.7.x msgctxt "helpcmd|ListChans|desc" msgid "List all channels" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1703 -======= -#: ClientCommand.cpp:1693 ->>>>>>> 1.7.x msgctxt "helpcmd|ListNicks|args" msgid "<#chan>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1704 -======= -#: ClientCommand.cpp:1694 ->>>>>>> 1.7.x msgctxt "helpcmd|ListNicks|desc" msgid "List all nicks on a channel" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1707 -======= -#: ClientCommand.cpp:1697 ->>>>>>> 1.7.x msgctxt "helpcmd|ListClients|desc" msgid "List all clients connected to your ZNC user" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1711 -======= -#: ClientCommand.cpp:1701 ->>>>>>> 1.7.x msgctxt "helpcmd|ListServers|desc" msgid "List all servers of current IRC network" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1715 -======= -#: ClientCommand.cpp:1705 ->>>>>>> 1.7.x msgctxt "helpcmd|AddNetwork|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1716 -======= -#: ClientCommand.cpp:1706 ->>>>>>> 1.7.x msgctxt "helpcmd|AddNetwork|desc" msgid "Add a network to your user" msgstr "Aggiungi un network al tuo account" -<<<<<<< HEAD #: ClientCommand.cpp:1718 -======= -#: ClientCommand.cpp:1708 ->>>>>>> 1.7.x msgctxt "helpcmd|DelNetwork|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1719 -======= -#: ClientCommand.cpp:1709 ->>>>>>> 1.7.x msgctxt "helpcmd|DelNetwork|desc" msgid "Delete a network from your user" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1721 -======= -#: ClientCommand.cpp:1711 ->>>>>>> 1.7.x msgctxt "helpcmd|ListNetworks|desc" msgid "List all networks" msgstr "Mostra tutte le reti" -<<<<<<< HEAD #: ClientCommand.cpp:1724 -======= -#: ClientCommand.cpp:1714 ->>>>>>> 1.7.x msgctxt "helpcmd|MoveNetwork|args" msgid " [new network]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1726 -======= -#: ClientCommand.cpp:1716 ->>>>>>> 1.7.x msgctxt "helpcmd|MoveNetwork|desc" msgid "Move an IRC network from one user to another" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1730 -======= -#: ClientCommand.cpp:1720 ->>>>>>> 1.7.x msgctxt "helpcmd|JumpNetwork|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1731 -======= -#: ClientCommand.cpp:1721 ->>>>>>> 1.7.x msgctxt "helpcmd|JumpNetwork|desc" msgid "" "Jump to another network (Alternatively, you can connect to ZNC several " "times, using `user/network` as username)" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1736 -======= -#: ClientCommand.cpp:1726 ->>>>>>> 1.7.x msgctxt "helpcmd|AddServer|args" msgid " [[+]port] [pass]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1737 -======= -#: ClientCommand.cpp:1727 ->>>>>>> 1.7.x msgctxt "helpcmd|AddServer|desc" msgid "" "Add a server to the list of alternate/backup servers of current IRC network." msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1741 -======= -#: ClientCommand.cpp:1731 ->>>>>>> 1.7.x msgctxt "helpcmd|DelServer|args" msgid " [port] [pass]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1742 -======= -#: ClientCommand.cpp:1732 ->>>>>>> 1.7.x msgctxt "helpcmd|DelServer|desc" msgid "" "Remove a server from the list of alternate/backup servers of current IRC " "network" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1748 -======= -#: ClientCommand.cpp:1738 ->>>>>>> 1.7.x msgctxt "helpcmd|AddTrustedServerFingerprint|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1749 -======= -#: ClientCommand.cpp:1739 ->>>>>>> 1.7.x msgctxt "helpcmd|AddTrustedServerFingerprint|desc" msgid "" "Add a trusted server SSL certificate fingerprint (SHA-256) to current IRC " "network." msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1754 -======= -#: ClientCommand.cpp:1744 ->>>>>>> 1.7.x msgctxt "helpcmd|DelTrustedServerFingerprint|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1755 -======= -#: ClientCommand.cpp:1745 ->>>>>>> 1.7.x msgctxt "helpcmd|DelTrustedServerFingerprint|desc" msgid "Delete a trusted server SSL certificate from current IRC network." msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1759 -======= -#: ClientCommand.cpp:1749 ->>>>>>> 1.7.x msgctxt "helpcmd|ListTrustedServerFingerprints|desc" msgid "List all trusted server SSL certificates of current IRC network." msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1762 -======= -#: ClientCommand.cpp:1752 ->>>>>>> 1.7.x msgctxt "helpcmd|EnableChan|args" msgid "<#chans>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1763 -======= -#: ClientCommand.cpp:1753 ->>>>>>> 1.7.x msgctxt "helpcmd|EnableChan|desc" msgid "Enable channels" msgstr "Abilita i canali" -<<<<<<< HEAD #: ClientCommand.cpp:1764 -======= -#: ClientCommand.cpp:1754 ->>>>>>> 1.7.x msgctxt "helpcmd|DisableChan|args" msgid "<#chans>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1765 -======= -#: ClientCommand.cpp:1755 ->>>>>>> 1.7.x msgctxt "helpcmd|DisableChan|desc" msgid "Disable channels" msgstr "Disabilita canali" -<<<<<<< HEAD #: ClientCommand.cpp:1766 -======= -#: ClientCommand.cpp:1756 ->>>>>>> 1.7.x msgctxt "helpcmd|Attach|args" msgid "<#chans>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1767 -======= -#: ClientCommand.cpp:1757 ->>>>>>> 1.7.x msgctxt "helpcmd|Attach|desc" msgid "Attach to channels" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1768 -======= -#: ClientCommand.cpp:1758 ->>>>>>> 1.7.x msgctxt "helpcmd|Detach|args" msgid "<#chans>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1769 -======= -#: ClientCommand.cpp:1759 ->>>>>>> 1.7.x msgctxt "helpcmd|Detach|desc" msgid "Detach from channels" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1772 -======= -#: ClientCommand.cpp:1762 ->>>>>>> 1.7.x msgctxt "helpcmd|Topics|desc" msgid "Show topics in all your channels" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1775 -======= -#: ClientCommand.cpp:1765 ->>>>>>> 1.7.x msgctxt "helpcmd|PlayBuffer|args" msgid "<#chan|query>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1776 -======= -#: ClientCommand.cpp:1766 ->>>>>>> 1.7.x msgctxt "helpcmd|PlayBuffer|desc" msgid "Play back the specified buffer" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1778 -======= -#: ClientCommand.cpp:1768 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearBuffer|args" msgid "<#chan|query>" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1779 -======= -#: ClientCommand.cpp:1769 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearBuffer|desc" msgid "Clear the specified buffer" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1781 -======= -#: ClientCommand.cpp:1771 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearAllBuffers|desc" msgid "Clear all channel and query buffers" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1784 -======= -#: ClientCommand.cpp:1774 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearAllChannelBuffers|desc" msgid "Clear the channel buffers" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1788 -======= -#: ClientCommand.cpp:1778 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearAllQueryBuffers|desc" msgid "Clear the query buffers" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1790 -======= -#: ClientCommand.cpp:1780 ->>>>>>> 1.7.x msgctxt "helpcmd|SetBuffer|args" msgid "<#chan|query> [linecount]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1791 -======= -#: ClientCommand.cpp:1781 ->>>>>>> 1.7.x msgctxt "helpcmd|SetBuffer|desc" msgid "Set the buffer count" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1795 -======= -#: ClientCommand.cpp:1785 ->>>>>>> 1.7.x msgctxt "helpcmd|SetBindHost|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1796 -======= -#: ClientCommand.cpp:1786 ->>>>>>> 1.7.x msgctxt "helpcmd|SetBindHost|desc" msgid "Set the bind host for this network" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1800 -======= -#: ClientCommand.cpp:1790 ->>>>>>> 1.7.x msgctxt "helpcmd|SetUserBindHost|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1801 -======= -#: ClientCommand.cpp:1791 ->>>>>>> 1.7.x msgctxt "helpcmd|SetUserBindHost|desc" msgid "Set the default bind host for this user" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1804 -======= -#: ClientCommand.cpp:1794 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearBindHost|desc" msgid "Clear the bind host for this network" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1807 -======= -#: ClientCommand.cpp:1797 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearUserBindHost|desc" msgid "Clear the default bind host for this user" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1813 -======= -#: ClientCommand.cpp:1803 ->>>>>>> 1.7.x msgctxt "helpcmd|ShowBindHost|desc" msgid "Show currently selected bind host" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1815 -======= -#: ClientCommand.cpp:1805 ->>>>>>> 1.7.x msgctxt "helpcmd|Jump|args" msgid "[server]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1816 -======= -#: ClientCommand.cpp:1806 ->>>>>>> 1.7.x msgctxt "helpcmd|Jump|desc" msgid "Jump to the next or the specified server" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1817 -======= -#: ClientCommand.cpp:1807 ->>>>>>> 1.7.x msgctxt "helpcmd|Disconnect|args" msgid "[message]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1818 -======= -#: ClientCommand.cpp:1808 ->>>>>>> 1.7.x msgctxt "helpcmd|Disconnect|desc" msgid "Disconnect from IRC" msgstr "Disconnetti da IRC" -<<<<<<< HEAD #: ClientCommand.cpp:1820 -======= -#: ClientCommand.cpp:1810 ->>>>>>> 1.7.x msgctxt "helpcmd|Connect|desc" msgid "Reconnect to IRC" msgstr "Riconnetti a IRC" -<<<<<<< HEAD #: ClientCommand.cpp:1823 -======= -#: ClientCommand.cpp:1813 ->>>>>>> 1.7.x msgctxt "helpcmd|Uptime|desc" msgid "Show for how long ZNC has been running" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1827 -======= -#: ClientCommand.cpp:1817 ->>>>>>> 1.7.x msgctxt "helpcmd|LoadMod|args" msgid "[--type=global|user|network] " msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1829 -======= -#: ClientCommand.cpp:1819 ->>>>>>> 1.7.x msgctxt "helpcmd|LoadMod|desc" msgid "Load a module" msgstr "Carica un modulo" -<<<<<<< HEAD #: ClientCommand.cpp:1831 -======= -#: ClientCommand.cpp:1821 ->>>>>>> 1.7.x msgctxt "helpcmd|UnloadMod|args" msgid "[--type=global|user|network] " msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1833 -======= -#: ClientCommand.cpp:1823 ->>>>>>> 1.7.x msgctxt "helpcmd|UnloadMod|desc" msgid "Unload a module" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1835 -======= -#: ClientCommand.cpp:1825 ->>>>>>> 1.7.x msgctxt "helpcmd|ReloadMod|args" msgid "[--type=global|user|network] " msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1837 -======= -#: ClientCommand.cpp:1827 ->>>>>>> 1.7.x msgctxt "helpcmd|ReloadMod|desc" msgid "Reload a module" msgstr "Ricarica un modulo" -<<<<<<< HEAD #: ClientCommand.cpp:1840 -======= -#: ClientCommand.cpp:1830 ->>>>>>> 1.7.x msgctxt "helpcmd|UpdateMod|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1841 -======= -#: ClientCommand.cpp:1831 ->>>>>>> 1.7.x msgctxt "helpcmd|UpdateMod|desc" msgid "Reload a module everywhere" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1847 -======= -#: ClientCommand.cpp:1837 ->>>>>>> 1.7.x msgctxt "helpcmd|ShowMOTD|desc" msgid "Show ZNC's message of the day" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1851 -======= -#: ClientCommand.cpp:1841 ->>>>>>> 1.7.x msgctxt "helpcmd|SetMOTD|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1852 -======= -#: ClientCommand.cpp:1842 ->>>>>>> 1.7.x msgctxt "helpcmd|SetMOTD|desc" msgid "Set ZNC's message of the day" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1854 -======= -#: ClientCommand.cpp:1844 ->>>>>>> 1.7.x msgctxt "helpcmd|AddMOTD|args" msgid "" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1855 -======= -#: ClientCommand.cpp:1845 ->>>>>>> 1.7.x msgctxt "helpcmd|AddMOTD|desc" msgid "Append to ZNC's MOTD" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1857 -======= -#: ClientCommand.cpp:1847 ->>>>>>> 1.7.x msgctxt "helpcmd|ClearMOTD|desc" msgid "Clear ZNC's MOTD" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1860 -======= -#: ClientCommand.cpp:1850 ->>>>>>> 1.7.x msgctxt "helpcmd|ListPorts|desc" msgid "Show all active listeners" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1862 -======= -#: ClientCommand.cpp:1852 ->>>>>>> 1.7.x msgctxt "helpcmd|AddPort|args" msgid "<[+]port> [bindhost [uriprefix]]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1865 -======= -#: ClientCommand.cpp:1855 ->>>>>>> 1.7.x msgctxt "helpcmd|AddPort|desc" msgid "Add another port for ZNC to listen on" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1869 -======= -#: ClientCommand.cpp:1859 ->>>>>>> 1.7.x msgctxt "helpcmd|DelPort|args" msgid " [bindhost]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1870 -======= -#: ClientCommand.cpp:1860 ->>>>>>> 1.7.x msgctxt "helpcmd|DelPort|desc" msgid "Remove a port from ZNC" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1873 -======= -#: ClientCommand.cpp:1863 ->>>>>>> 1.7.x msgctxt "helpcmd|Rehash|desc" msgid "Reload global settings, modules, and listeners from znc.conf" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1876 -======= -#: ClientCommand.cpp:1866 ->>>>>>> 1.7.x msgctxt "helpcmd|SaveConfig|desc" msgid "Save the current settings to disk" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1879 -======= -#: ClientCommand.cpp:1869 ->>>>>>> 1.7.x msgctxt "helpcmd|ListUsers|desc" msgid "List all ZNC users and their connection status" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1882 -======= -#: ClientCommand.cpp:1872 ->>>>>>> 1.7.x msgctxt "helpcmd|ListAllUserNetworks|desc" msgid "List all ZNC users and their networks" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1885 -======= -#: ClientCommand.cpp:1875 ->>>>>>> 1.7.x msgctxt "helpcmd|ListChans|args" msgid "[user ]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1888 -======= -#: ClientCommand.cpp:1878 ->>>>>>> 1.7.x msgctxt "helpcmd|ListClients|args" msgid "[user]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1889 -======= -#: ClientCommand.cpp:1879 ->>>>>>> 1.7.x msgctxt "helpcmd|ListClients|desc" msgid "List all connected clients" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1891 -======= -#: ClientCommand.cpp:1881 ->>>>>>> 1.7.x msgctxt "helpcmd|Traffic|desc" msgid "Show basic traffic stats for all ZNC users" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1893 -======= -#: ClientCommand.cpp:1883 ->>>>>>> 1.7.x msgctxt "helpcmd|Broadcast|args" msgid "[message]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1894 -======= -#: ClientCommand.cpp:1884 ->>>>>>> 1.7.x msgctxt "helpcmd|Broadcast|desc" msgid "Broadcast a message to all ZNC users" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1897 -======= -#: ClientCommand.cpp:1887 ->>>>>>> 1.7.x msgctxt "helpcmd|Shutdown|args" msgid "[message]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1898 -======= -#: ClientCommand.cpp:1888 ->>>>>>> 1.7.x msgctxt "helpcmd|Shutdown|desc" msgid "Shut down ZNC completely" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1899 -======= -#: ClientCommand.cpp:1889 ->>>>>>> 1.7.x msgctxt "helpcmd|Restart|args" msgid "[message]" msgstr "" -<<<<<<< HEAD #: ClientCommand.cpp:1900 -======= -#: ClientCommand.cpp:1890 ->>>>>>> 1.7.x msgctxt "helpcmd|Restart|desc" msgid "Restart ZNC" msgstr "" @@ -2521,7 +1681,6 @@ msgstr "" msgid "Some socket reached its max buffer limit and was closed!" msgstr "" -<<<<<<< HEAD #: SSLVerifyHost.cpp:481 msgid "hostname doesn't match" msgstr "" @@ -2531,17 +1690,6 @@ msgid "malformed hostname in certificate" msgstr "" #: SSLVerifyHost.cpp:489 -======= -#: SSLVerifyHost.cpp:448 -msgid "hostname doesn't match" -msgstr "" - -#: SSLVerifyHost.cpp:452 -msgid "malformed hostname in certificate" -msgstr "" - -#: SSLVerifyHost.cpp:456 ->>>>>>> 1.7.x msgid "hostname verification error" msgstr "" @@ -2561,7 +1709,6 @@ msgid "" "to this user" msgstr "" -<<<<<<< HEAD #: User.cpp:912 msgid "Password is empty" msgstr "" @@ -2575,20 +1722,5 @@ msgid "Username is invalid" msgstr "" #: User.cpp:1199 -======= -#: User.cpp:907 -msgid "Password is empty" -msgstr "" - -#: User.cpp:912 -msgid "Username is empty" -msgstr "" - -#: User.cpp:917 -msgid "Username is invalid" -msgstr "" - -#: User.cpp:1188 ->>>>>>> 1.7.x msgid "Unable to find modinfo {1}: {2}" msgstr "" diff --git a/src/po/znc.nl_NL.po b/src/po/znc.nl_NL.po index f1d36296..295faa76 100644 --- a/src/po/znc.nl_NL.po +++ b/src/po/znc.nl_NL.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: nl\n" "X-Crowdin-File: /master/src/po/znc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Dutch\n" "Language: nl_NL\n" @@ -418,20 +414,12 @@ msgstr "" "Module {1} is niet compatible gecompileerd: kern is '{2}', module is '{3}'. " "Hercompileer deze module." -<<<<<<< HEAD #: Modules.cpp:2023 Modules.cpp:2029 -======= -#: Modules.cpp:2022 Modules.cpp:2028 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Command" msgstr "Commando" -<<<<<<< HEAD #: Modules.cpp:2024 Modules.cpp:2031 -======= -#: Modules.cpp:2023 Modules.cpp:2029 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Description" msgstr "Beschrijving" diff --git a/src/po/znc.pt_BR.po b/src/po/znc.pt_BR.po index 24a7d1e4..81142d41 100644 --- a/src/po/znc.pt_BR.po +++ b/src/po/znc.pt_BR.po @@ -8,11 +8,7 @@ msgstr "" "X-Crowdin-Language: pt-BR\n" "X-Crowdin-File: /master/src/po/znc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Portuguese, Brazilian\n" "Language: pt_BR\n" @@ -397,20 +393,12 @@ msgid "" "this module." msgstr "" -<<<<<<< HEAD #: Modules.cpp:2023 Modules.cpp:2029 -======= -#: Modules.cpp:2022 Modules.cpp:2028 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Command" msgstr "Comando" -<<<<<<< HEAD #: Modules.cpp:2024 Modules.cpp:2031 -======= -#: Modules.cpp:2023 Modules.cpp:2029 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Description" msgstr "Descrição" diff --git a/src/po/znc.ru_RU.po b/src/po/znc.ru_RU.po index d3c18f03..8a64f7bf 100644 --- a/src/po/znc.ru_RU.po +++ b/src/po/znc.ru_RU.po @@ -10,11 +10,7 @@ msgstr "" "X-Crowdin-Language: ru\n" "X-Crowdin-File: /master/src/po/znc.pot\n" "Project-Id-Version: znc-bouncer\n" -<<<<<<< HEAD "Last-Translator: Various people\n" -======= -"Last-Translator: DarthGandalf\n" ->>>>>>> 1.7.x "Language-Team: Russian\n" "Language: ru_RU\n" @@ -407,20 +403,12 @@ msgstr "" "Модуль {1} собран не так: ядро — «{2}», а модуль — «{3}». Пересоберите этот " "модуль." -<<<<<<< HEAD #: Modules.cpp:2023 Modules.cpp:2029 -======= -#: Modules.cpp:2022 Modules.cpp:2028 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Command" msgstr "Команда" -<<<<<<< HEAD #: Modules.cpp:2024 Modules.cpp:2031 -======= -#: Modules.cpp:2023 Modules.cpp:2029 ->>>>>>> 1.7.x msgctxt "modhelpcmd" msgid "Description" msgstr "Описание"