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

Currently translated at 99.0% (319 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 8be283a5..bd0b8b5d 100644
--- a/lang/gpxsee_ru.ts
+++ b/lang/gpxsee_ru.ts
@@ -1095,7 +1095,11 @@
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="46"/>
         <source>Standard</source>
+<<<<<<< HEAD
         <translation>Стандартный</translation>
+=======
+        <translation>Стандартное</translation>
+>>>>>>> Translated using Weblate (Russian)
     </message>
     <message>
         <location filename="../src/GUI/optionsdialog.cpp" line="51"/>