From 95616601041eaaeb879d7e06e2ae8b05c7da0645 Mon Sep 17 00:00:00 2001
From: Zetok Zalbavar <zetok@openmailbox.org>
Date: Fri, 28 Aug 2015 11:31:43 +0100
Subject: [PATCH] Simplyfy advanced settings - DB setting

thanks to @AWeinb for idea, fixes #1514
---
 src/widget/form/settings/advancedform.cpp    | 6 +++---
 src/widget/form/settings/advancedsettings.ui | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/widget/form/settings/advancedform.cpp b/src/widget/form/settings/advancedform.cpp
index e73dea62b..5d5ea739c 100644
--- a/src/widget/form/settings/advancedform.cpp
+++ b/src/widget/form/settings/advancedform.cpp
@@ -36,9 +36,9 @@ AdvancedForm::AdvancedForm() :
 
     bodyUI->cbMakeToxPortable->setChecked(Settings::getInstance().getMakeToxPortable());
     bodyUI->syncTypeComboBox->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
-    bodyUI->syncTypeComboBox->addItems({tr("FULL - very safe, slowest (recommended)"),
-                                        tr("NORMAL - almost as safe as FULL, about 20% faster than FULL"),
-                                        tr("OFF - disables all safety, when something goes wrong your history may be lost, fastest (not recommended)")
+    bodyUI->syncTypeComboBox->addItems({tr("Synchronized - safe / recommended"),
+                                        tr("Partially async - risky / 20% faster"),
+                                        tr("Asynchronous - dangerous / fastest")
                                        });
     int index = 2 - static_cast<int>(Settings::getInstance().getDbSyncType());
     bodyUI->syncTypeComboBox->setCurrentIndex(index);
diff --git a/src/widget/form/settings/advancedsettings.ui b/src/widget/form/settings/advancedsettings.ui
index fe50a8603..c0d15be0d 100644
--- a/src/widget/form/settings/advancedsettings.ui
+++ b/src/widget/form/settings/advancedsettings.ui
@@ -73,7 +73,7 @@
             <item>
              <widget class="QLabel" name="dbLabel">
               <property name="text">
-               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://www.sqlite.org/pragma.html#pragma_synchronous&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Synchronous writing to DB&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;http://www.sqlite.org/pragma.html#pragma_synchronous&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Writing to DB&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
               </property>
               <property name="textFormat">
                <enum>Qt::RichText</enum>