From 16c3fea8a88b3d0253dd9054bc5ae61cf98f81cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Wed, 13 Nov 2019 09:26:42 +0100
Subject: [PATCH] Fixed weblate merge conflict

---
 lang/gpxsee_fi.ts | 2 +-
 lang/gpxsee_ru.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/gpxsee_fi.ts b/lang/gpxsee_fi.ts
index cceea835..b97f5d03 100644
--- a/lang/gpxsee_fi.ts
+++ b/lang/gpxsee_fi.ts
@@ -1276,7 +1276,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="352"/>
         <source>Automatic</source>
-        <translation type="unfinished"></translation>
+        <translation>Automaattinen</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="366"/>
diff --git a/lang/gpxsee_ru.ts b/lang/gpxsee_ru.ts
index ac521b4e..b1045d32 100644
--- a/lang/gpxsee_ru.ts
+++ b/lang/gpxsee_ru.ts
@@ -1277,7 +1277,7 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="352"/>
         <source>Automatic</source>
-        <translation type="unfinished"></translation>
+        <translation>Автоматическое</translation>
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="366"/>