adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-07 09:22:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Alexey Sokolov
2019-07-12 08:24:58 +01:00
parent c56a4093d5
commit 0ad4e51b39
513 changed files with 0 additions and 6306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/po/admindebug.bg_BG.po
-6
View File
@@ -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"
modules/po/admindebug.de_DE.po
-4
View File
@@ -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"
modules/po/admindebug.es_ES.po
-4
View File
@@ -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"
modules/po/admindebug.fr_FR.po
-4
View File
@@ -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"
modules/po/admindebug.id_ID.po
-4
View File
@@ -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"
modules/po/admindebug.it_IT.po
-6
View File
@@ -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"
modules/po/admindebug.nl_NL.po
-4
View File
@@ -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"
modules/po/admindebug.pt_BR.po
-4
View File
@@ -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"
modules/po/admindebug.ru_RU.po
-4
View File
@@ -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"
modules/po/adminlog.bg_BG.po
-6
View File
@@ -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"
modules/po/adminlog.de_DE.po
-4
View File
@@ -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"
modules/po/adminlog.es_ES.po
-4
View File
@@ -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"
modules/po/adminlog.fr_FR.po
-4
View File
@@ -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"
modules/po/adminlog.id_ID.po
-4
View File
@@ -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"
modules/po/adminlog.it_IT.po
-6
View File
@@ -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"
modules/po/adminlog.nl_NL.po
-4
View File
@@ -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"
modules/po/adminlog.pt_BR.po
-4
View File
@@ -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"
modules/po/adminlog.ru_RU.po
-4
View File
@@ -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"
modules/po/alias.bg_BG.po
-6
View File
@@ -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"
modules/po/alias.de_DE.po
-4
View File
@@ -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"
modules/po/alias.es_ES.po
-4
View File
@@ -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"
modules/po/alias.fr_FR.po
-4
View File
@@ -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"
modules/po/alias.id_ID.po
-4
View File
@@ -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"
modules/po/alias.it_IT.po
-6
View File
@@ -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"
modules/po/alias.nl_NL.po
-4
View File
@@ -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"
modules/po/alias.pt_BR.po
-4
View File
@@ -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"
modules/po/alias.ru_RU.po
-4
View File
@@ -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"
modules/po/autoattach.bg_BG.po
-6
View File
@@ -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"
modules/po/autoattach.de_DE.po
-4
View File
@@ -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"
modules/po/autoattach.es_ES.po
-4
View File
@@ -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"
modules/po/autoattach.fr_FR.po
-4
View File
@@ -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"
modules/po/autoattach.id_ID.po
-4
View File
@@ -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"
modules/po/autoattach.it_IT.po
-6
View File
@@ -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"
modules/po/autoattach.nl_NL.po
-4
View File
@@ -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"
modules/po/autoattach.pt_BR.po
-4
View File
@@ -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"
modules/po/autoattach.ru_RU.po
-4
View File
@@ -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"
modules/po/autocycle.bg_BG.po
-22
View File
@@ -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 ""
modules/po/autocycle.de_DE.po
-4
View File
@@ -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"
modules/po/autocycle.es_ES.po
-4
View File
@@ -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"
modules/po/autocycle.fr_FR.po
-4
View File
@@ -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"
modules/po/autocycle.id_ID.po
-4
View File
@@ -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"
modules/po/autocycle.it_IT.po
-22
View File
@@ -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 ""
modules/po/autocycle.nl_NL.po
-4
View File
@@ -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"
modules/po/autocycle.pt_BR.po
-4
View File
@@ -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"
modules/po/autocycle.ru_RU.po
-4
View File
@@ -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"
modules/po/autoop.bg_BG.po
-6
View File
@@ -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"
modules/po/autoop.de_DE.po
-4
View File
@@ -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"
modules/po/autoop.es_ES.po
-4
View File
@@ -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"
modules/po/autoop.fr_FR.po
-4
View File
@@ -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"
modules/po/autoop.id_ID.po
-4
View File
@@ -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"
modules/po/autoop.it_IT.po
-6
View File
@@ -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"
modules/po/autoop.nl_NL.po
-4
View File
@@ -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"
modules/po/autoop.pt_BR.po
-4
View File
@@ -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"
modules/po/autoop.ru_RU.po
-4
View File
@@ -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"
modules/po/autoreply.bg_BG.po
-6
View File
@@ -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"
modules/po/autoreply.de_DE.po
-4
View File
@@ -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"
modules/po/autoreply.es_ES.po
-4
View File
@@ -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"
modules/po/autoreply.fr_FR.po
-4
View File
@@ -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"
modules/po/autoreply.id_ID.po
-4
View File
@@ -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"
modules/po/autoreply.it_IT.po
-6
View File
@@ -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"
modules/po/autoreply.nl_NL.po
-4
View File
@@ -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"
modules/po/autoreply.pt_BR.po
-4
View File
@@ -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"
modules/po/autoreply.ru_RU.po
-4
View File
@@ -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"
modules/po/autovoice.bg_BG.po
-6
View File
@@ -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"
modules/po/autovoice.de_DE.po
-4
View File
@@ -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"
modules/po/autovoice.es_ES.po
-4
View File
@@ -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"
modules/po/autovoice.fr_FR.po
-4
View File
@@ -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"
modules/po/autovoice.id_ID.po
-4
View File
@@ -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"
modules/po/autovoice.it_IT.po
-6
View File
@@ -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"
modules/po/autovoice.nl_NL.po
-4
View File
@@ -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"
modules/po/autovoice.pt_BR.po
-4
View File
@@ -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"
modules/po/autovoice.ru_RU.po
-4
View File
@@ -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"
modules/po/awaystore.bg_BG.po
-6
View File
@@ -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"
modules/po/awaystore.de_DE.po
-4
View File
@@ -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"
modules/po/awaystore.es_ES.po
-4
View File
@@ -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"
modules/po/awaystore.fr_FR.po
-4
View File
@@ -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"
modules/po/awaystore.id_ID.po
-4
View File
@@ -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"
modules/po/awaystore.it_IT.po
-6
View File
@@ -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"
modules/po/awaystore.nl_NL.po
-4
View File
@@ -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"
modules/po/awaystore.pt_BR.po
-4
View File
@@ -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"
modules/po/awaystore.ru_RU.po
-4
View File
@@ -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"
modules/po/block_motd.bg_BG.po
-6
View File
@@ -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"
modules/po/block_motd.de_DE.po
-4
View File
@@ -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"
modules/po/block_motd.es_ES.po
-4
View File
@@ -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"
modules/po/block_motd.fr_FR.po
-4
View File
@@ -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"
modules/po/block_motd.id_ID.po
-4
View File
@@ -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"
modules/po/block_motd.it_IT.po
-6
View File
@@ -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"
modules/po/block_motd.nl_NL.po
-4
View File
@@ -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"
modules/po/block_motd.pt_BR.po
-4
View File
@@ -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"
modules/po/block_motd.ru_RU.po
-4
View File
@@ -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"
modules/po/blockuser.bg_BG.po
-6
View File
@@ -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"
modules/po/blockuser.de_DE.po
-4
View File
@@ -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"
modules/po/blockuser.es_ES.po
-4
View File
@@ -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"
modules/po/blockuser.fr_FR.po
-4
View File
@@ -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"
modules/po/blockuser.id_ID.po
-4
View File
@@ -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"
modules/po/blockuser.it_IT.po
-6
View File
@@ -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"
modules/po/blockuser.nl_NL.po
-4
View File
@@ -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"
modules/po/blockuser.pt_BR.po
-4
View File
@@ -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"
modules/po/blockuser.ru_RU.po
-4
View File
@@ -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"
modules/po/bouncedcc.bg_BG.po
-6
View File
@@ -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"

Some files were not shown because too many files have changed in this diff Show More