root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-10-06 06:43:22 +02:00
Code Issues Projects Releases Activity

Fixed broken merge

Browse Source
This commit is contained in:
Martin Tůma 2018-09-23 12:20:04 +02:00
parent bd64ca4f57
commit 083dd39bef
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/gpxsee_ru.ts
View File

@ -1095,15 +1095,7 @@
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="46"/>
<source>Standard</source>
<<<<<<< HEAD
<<<<<<< HEAD
<translation>Стандартный</translation>
=======
<translation>Стандартное</translation>
>>>>>>> Translated using Weblate (Russian)
=======
<translation>Стандартный</translation>
>>>>>>> Translated using Weblate (Russian)
</message>
<message>
<location filename="../src/GUI/optionsdialog.cpp" line="51"/>