#
#
# patch "res/forms/dialogs/add_edit_variables.ui"
#  from [e50545a1c61e521b37947cd7169633cc57ba8011]
#    to [e3161c2e52905fbbe1d1b942868281c00b5bea77]
# 
# patch "res/forms/dialogs/application_update.ui"
#  from [324e4ede735cc93710f92943af2482a79e8abcde]
#    to [e8626d695a6e420844b18bef58b0e9c93d2e37a1]
# 
# patch "res/forms/dialogs/key_management.ui"
#  from [17a4cf740abefaf1e5ca0128d6ac58efe0c634e4]
#    to [1a04855cafa43b50156b40e1caa6fbd1613a82ff]
# 
# patch "res/forms/dialogs/unaccounted_renames.ui"
#  from [40c0a724eb560f120feab4dd944ddc858c93292a]
#    to [2d4585fe2fd751f577bac6313d0f435442cdd148]
#
============================================================
--- res/forms/dialogs/add_edit_variables.ui	e50545a1c61e521b37947cd7169633cc57ba8011
+++ res/forms/dialogs/add_edit_variables.ui	e3161c2e52905fbbe1d1b942868281c00b5bea77
@@ -1,42 +1,44 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>AddEditDatabaseVariable</class>
- <widget class="QDialog" name="AddEditDatabaseVariable" >
-  <property name="geometry" >
+ <widget class="QDialog" name="AddEditDatabaseVariable">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>393</width>
-    <height>135</height>
+    <height>151</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Add / edit a database variable</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="../guitone.qrc" >:/icons/guitone.png</iconset>
+  <property name="windowIcon">
+   <iconset resource="../../guitone.qrc">
+    <normaloff>:/icons/guitone.png</normaloff>:/icons/guitone.png</iconset>
   </property>
-  <layout class="QVBoxLayout" >
+  <layout class="QVBoxLayout">
    <item>
-    <layout class="QHBoxLayout" >
+    <layout class="QHBoxLayout">
      <item>
-      <layout class="QVBoxLayout" >
+      <layout class="QVBoxLayout">
        <item>
-        <widget class="QLabel" name="label_3" >
-         <property name="text" >
+        <widget class="QLabel" name="label_3">
+         <property name="text">
           <string>Domain</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="label" >
-         <property name="text" >
+        <widget class="QLabel" name="label">
+         <property name="text">
           <string>Key</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="label_2" >
-         <property name="text" >
+        <widget class="QLabel" name="label_2">
+         <property name="text">
           <string>Value</string>
          </property>
         </widget>
@@ -44,25 +46,25 @@
       </layout>
      </item>
      <item>
-      <layout class="QVBoxLayout" >
+      <layout class="QVBoxLayout">
        <item>
-        <widget class="QComboBox" name="varDomain" >
-         <property name="editable" >
+        <widget class="QComboBox" name="varDomain">
+         <property name="editable">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QComboBox" name="varKey" >
-         <property name="editable" >
+        <widget class="QComboBox" name="varKey">
+         <property name="editable">
           <bool>true</bool>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QLineEdit" name="varValue" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+        <widget class="QLineEdit" name="varValue">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -74,14 +76,14 @@
     </layout>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
-     <property name="centerButtons" >
+     <property name="centerButtons">
       <bool>false</bool>
      </property>
     </widget>
@@ -89,7 +91,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../guitone.qrc" />
+  <include location="../../guitone.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -98,11 +100,11 @@
    <receiver>AddEditDatabaseVariable</receiver>
    <slot>reject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>271</x>
      <y>109</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>236</x>
      <y>122</y>
     </hint>
@@ -114,11 +116,11 @@
    <receiver>AddEditDatabaseVariable</receiver>
    <slot>accept()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>353</x>
      <y>107</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>379</x>
      <y>127</y>
     </hint>
============================================================
--- res/forms/dialogs/application_update.ui	324e4ede735cc93710f92943af2482a79e8abcde
+++ res/forms/dialogs/application_update.ui	e8626d695a6e420844b18bef58b0e9c93d2e37a1
@@ -160,7 +160,6 @@
  </widget>
  <resources>
   <include location="../../guitone.qrc"/>
-  <include location="../guitone.qrc"/>
  </resources>
  <connections>
   <connection>
============================================================
--- res/forms/dialogs/key_management.ui	17a4cf740abefaf1e5ca0128d6ac58efe0c634e4
+++ res/forms/dialogs/key_management.ui	1a04855cafa43b50156b40e1caa6fbd1613a82ff
@@ -133,7 +133,6 @@
  </tabstops>
  <resources>
   <include location="../../guitone.qrc"/>
-  <include location="../guitone.qrc"/>
  </resources>
  <connections>
   <connection>
============================================================
--- res/forms/dialogs/unaccounted_renames.ui	40c0a724eb560f120feab4dd944ddc858c93292a
+++ res/forms/dialogs/unaccounted_renames.ui	2d4585fe2fd751f577bac6313d0f435442cdd148
@@ -68,7 +68,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="../guitone.qrc"/>
+  <include location="../../guitone.qrc"/>
  </resources>
  <connections>
   <connection>