adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-07-06 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove merge conflicts from .po files

Browse Source
This commit is contained in:
Alexey Sokolov
2020-06-23 08:16:01 +01:00
parent 5c8361b89f
commit fd24fa6776
513 changed files with 0 additions and 2607 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/po/znc.bg_BG.po
-5
View File
@@ -6,13 +6,8 @@ msgstr ""
"X-Crowdin-Project: znc-bouncer\n"
"X-Crowdin-Project-ID: 289533\n"
"X-Crowdin-Language: bg\n"
<<<<<<< HEAD
"X-Crowdin-File: /master/src/po/znc.pot\n"
"X-Crowdin-File-ID: 146\n"
=======
"X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
"X-Crowdin-File-ID: 284\n"
>>>>>>> 1.8.x
"Project-Id-Version: znc-bouncer\n"
"Language-Team: Bulgarian\n"
"Language: bg_BG\n"
src/po/znc.es_ES.po
-5
View File
@@ -6,13 +6,8 @@ msgstr ""
"X-Crowdin-Project: znc-bouncer\n"
"X-Crowdin-Project-ID: 289533\n"
"X-Crowdin-Language: es-ES\n"
<<<<<<< HEAD
"X-Crowdin-File: /master/src/po/znc.pot\n"
"X-Crowdin-File-ID: 146\n"
=======
"X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
"X-Crowdin-File-ID: 284\n"
>>>>>>> 1.8.x
"Project-Id-Version: znc-bouncer\n"
"Language-Team: Spanish\n"
"Language: es_ES\n"
src/po/znc.fr_FR.po
-5
View File
@@ -6,13 +6,8 @@ msgstr ""
"X-Crowdin-Project: znc-bouncer\n"
"X-Crowdin-Project-ID: 289533\n"
"X-Crowdin-Language: fr\n"
<<<<<<< HEAD
"X-Crowdin-File: /master/src/po/znc.pot\n"
"X-Crowdin-File-ID: 146\n"
=======
"X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
"X-Crowdin-File-ID: 284\n"
>>>>>>> 1.8.x
"Project-Id-Version: znc-bouncer\n"
"Language-Team: French\n"
"Language: fr_FR\n"
src/po/znc.id_ID.po
-5
View File
@@ -6,13 +6,8 @@ msgstr ""
"X-Crowdin-Project: znc-bouncer\n"
"X-Crowdin-Project-ID: 289533\n"
"X-Crowdin-Language: id\n"
<<<<<<< HEAD
"X-Crowdin-File: /master/src/po/znc.pot\n"
"X-Crowdin-File-ID: 146\n"
=======
"X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
"X-Crowdin-File-ID: 284\n"
>>>>>>> 1.8.x
"Project-Id-Version: znc-bouncer\n"
"Language-Team: Indonesian\n"
"Language: id_ID\n"
src/po/znc.it_IT.po
-5
View File
@@ -6,13 +6,8 @@ msgstr ""
"X-Crowdin-Project: znc-bouncer\n"
"X-Crowdin-Project-ID: 289533\n"
"X-Crowdin-Language: it\n"
<<<<<<< HEAD
"X-Crowdin-File: /master/src/po/znc.pot\n"
"X-Crowdin-File-ID: 146\n"
=======
"X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
"X-Crowdin-File-ID: 284\n"
>>>>>>> 1.8.x
"Project-Id-Version: znc-bouncer\n"
"Language-Team: Italian\n"
"Language: it_IT\n"
src/po/znc.nl_NL.po
-5
View File
@@ -6,13 +6,8 @@ msgstr ""
"X-Crowdin-Project: znc-bouncer\n"
"X-Crowdin-Project-ID: 289533\n"
"X-Crowdin-Language: nl\n"
<<<<<<< HEAD
"X-Crowdin-File: /master/src/po/znc.pot\n"
"X-Crowdin-File-ID: 146\n"
=======
"X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
"X-Crowdin-File-ID: 284\n"
>>>>>>> 1.8.x
"Project-Id-Version: znc-bouncer\n"
"Language-Team: Dutch\n"
"Language: nl_NL\n"
src/po/znc.pl_PL.po
-36
View File
@@ -8,13 +8,8 @@ msgstr ""
"X-Crowdin-Project: znc-bouncer\n"
"X-Crowdin-Project-ID: 289533\n"
"X-Crowdin-Language: pl\n"
<<<<<<< HEAD
"X-Crowdin-File: /master/src/po/znc.pot\n"
"X-Crowdin-File-ID: 146\n"
=======
"X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
"X-Crowdin-File-ID: 284\n"
>>>>>>> 1.8.x
"Project-Id-Version: znc-bouncer\n"
"Language-Team: Polish\n"
"Language: pl_PL\n"
@@ -61,7 +56,6 @@ msgstr ""
"*status help</code>” i “<code>/msg *status loadmod &lt;moduł&gt;</code>”). "
"Po załadowaniu niektórych modułów WWW menu się rozwinie."
<<<<<<< HEAD
#: znc.cpp:1554
msgid "User already exists"
msgstr "Użytkownik już istnieje"
@@ -83,29 +77,6 @@ msgid "Invalid port"
msgstr "Nieprawidłowy port"
#: znc.cpp:1813 ClientCommand.cpp:1637
=======
#: znc.cpp:1562
msgid "User already exists"
msgstr "Użytkownik już istnieje"
#: znc.cpp:1670
msgid "IPv6 is not enabled"
msgstr "IPv6 nie jest włączone"
#: znc.cpp:1678
msgid "SSL is not enabled"
msgstr "SSL nie jest włączone"
#: znc.cpp:1686
msgid "Unable to locate pem file: {1}"
msgstr "Nie udało się odnaleźć pliku pem: {1}"
#: znc.cpp:1705
msgid "Invalid port"
msgstr "Nieprawidłowy port"
#: znc.cpp:1821 ClientCommand.cpp:1637
>>>>>>> 1.8.x
msgid "Unable to bind: {1}"
msgstr "Nie udało się przypiąć: {1}"
@@ -313,17 +284,10 @@ msgstr "Użycie: /detach <#kanały>"
#: Client.cpp:1369 ClientCommand.cpp:154
msgid "Detached {1} channel"
msgid_plural "Detached {1} channels"
<<<<<<< HEAD
msgstr[0] "Odpięto kanał {1}"
msgstr[1] ""
msgstr[2] ""
msgstr[3] "Odpięto {1} kanały"
=======
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
>>>>>>> 1.8.x
#: Chan.cpp:678
msgid "Buffer Playback..."
src/po/znc.pt_BR.po
-5
View File
@@ -6,13 +6,8 @@ msgstr ""
"X-Crowdin-Project: znc-bouncer\n"
"X-Crowdin-Project-ID: 289533\n"
"X-Crowdin-Language: pt-BR\n"
<<<<<<< HEAD
"X-Crowdin-File: /master/src/po/znc.pot\n"
"X-Crowdin-File-ID: 146\n"
=======
"X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
"X-Crowdin-File-ID: 284\n"
>>>>>>> 1.8.x
"Project-Id-Version: znc-bouncer\n"
"Language-Team: Portuguese, Brazilian\n"
"Language: pt_BR\n"
src/po/znc.ru_RU.po
-5
View File
@@ -8,13 +8,8 @@ msgstr ""
"X-Crowdin-Project: znc-bouncer\n"
"X-Crowdin-Project-ID: 289533\n"
"X-Crowdin-Language: ru\n"
<<<<<<< HEAD
"X-Crowdin-File: /master/src/po/znc.pot\n"
"X-Crowdin-File-ID: 146\n"
=======
"X-Crowdin-File: /1.8.x/src/po/znc.pot\n"
"X-Crowdin-File-ID: 284\n"
>>>>>>> 1.8.x
"Project-Id-Version: znc-bouncer\n"
"Language-Team: Russian\n"
"Language: ru_RU\n"