From db0d9ceffb209a74db2170b19dd2dd33300a5fdf Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@gmail.com>
Date: Tue, 11 Sep 2018 06:25:51 +0000
Subject: [PATCH] Translated using Weblate (Russian)

Currently translated at 99.3% (320 of 322 strings)

Translation: GPXSee/Translations
Translate-URL: https://hosted.weblate.org/projects/gpxsee/translations/ru/
---
 lang/gpxsee_ru.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lang/gpxsee_ru.ts b/lang/gpxsee_ru.ts
index bd0b8b5d..324e40d1 100644
--- a/lang/gpxsee_ru.ts
+++ b/lang/gpxsee_ru.ts
@@ -1095,10 +1095,14 @@
     <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>