haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge error

This commit is contained in:
Seth Hillbrand 2020-10-16 11:36:02 -07:00
parent befa05d1e0
commit 67d874ee61
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pl/kicad.po
View File

@ -2,21 +2,12 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: kicad\n" "Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2020-10-16 10:50-0700\n"
"PO-Revision-Date: 2019-06-20 10:04+0200\n"
"Last-Translator: Kerusey Karyu <keruseykaryu@o2.pl>\n"
"Language-Team: Polish KiCad Translators: Mateusz Skowroński, Krzysztof Kawa, "
"Kerusey Karyu, Daniel Dawid Majewski, Marek Ledworowski\n"
"Language: pl_PL\n"
=======
"POT-Creation-Date: 2019-07-09 10:02+0200\n" "POT-Creation-Date: 2019-07-09 10:02+0200\n"
"PO-Revision-Date: 2020-10-16 17:52+0000\n" "PO-Revision-Date: 2020-10-16 17:52+0000\n"
"Last-Translator: Mark Roszko <mark.roszko@gmail.com>\n" "Last-Translator: Mark Roszko <mark.roszko@gmail.com>\n"
"Language-Team: Polish <https://hosted.weblate.org/projects/kicad/" "Language-Team: Polish <https://hosted.weblate.org/projects/kicad/"
"master-source/pl/>\n" "master-source/pl/>\n"
"Language: pl\n" "Language: pl\n"
>>>>>>> weblate/master
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"