mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-21 17:15:32 -07:00
Code Issues Packages Projects Releases Activity

Remove merge conflict in Czech translation

Browse Source
This commit is contained in:
David Hrdlička
2025-10-26 02:07:16 +02:00
committed by GitHub
parent 1063ac86fd
commit 41f2c0ac0b
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/languages/cs-CZ.po
View File

@@ -975,21 +975,11 @@ msgstr "Thrustmaster Flight Control System"
msgid "Thrustmaster FCS + Rudder Control System"
msgstr "Thrustmaster FCS + Rudder Control System"
<<<<<<< HEAD
msgid "Thrustmaster Formula T1/T2 with Adaptor"
msgstr "Thrustmaster Formula T1/T2 s adaptérem"
=======
msgid "Thrustmaster Formula T1/T2 with adapter"
msgstr "Thrustmaster Formula T1/T2 s adaptérem"
>>>>>>> 0a80ae2debdb61f381194ed5f17b5579d5510cc4
<<<<<<< HEAD
msgid "Thrustmaster Formula T1/T2 without Adaptor"
msgstr "Thrustmaster Formula T1/T2 bez adaptéru"
=======
msgid "Thrustmaster Formula T1/T2 without adapter"
msgstr "Thrustmaster Formula T1/T2 bez adaptéru"
>>>>>>> 0a80ae2debdb61f381194ed5f17b5579d5510cc4
msgid "None"
msgstr "Žadné"