From f748c127abaf635b6fbd97c1b6c0a60308bca997 Mon Sep 17 00:00:00 2001
From: DelazJ <delazj@gmail.com>
Date: Sun, 20 Sep 2015 23:31:35 +0200
Subject: [PATCH] enforces consistency

---
 resources/customization.xml                          | 8 ++++----
 src/gui/editorwidgets/qgshiddenwidgetfactory.cpp     | 2 +-
 src/ui/editorwidgets/qgsuniquevaluesconfigdlgbase.ui | 2 +-
 src/ui/qgsaddattrdialogbase.ui                       | 2 +-
 src/ui/qgsdelattrdialogbase.ui                       | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/customization.xml b/resources/customization.xml
index 406a426593c..1d63b321895 100644
--- a/resources/customization.xml
+++ b/resources/customization.xml
@@ -1569,10 +1569,10 @@
         <widget objectName="leUncheckedState" class="QLineEdit" label=""/>
       </widget>
       <widget objectName="hiddenPage" class="QWidget" label="">
-        <widget objectName="hiddenLabel" class="QLabel" label="A hidden attribute will be invisible - the user is not able to see it's contents."/>
+        <widget objectName="hiddenLabel" class="QLabel" label="A hidden field will be invisible - the user is not able to see its contents."/>
       </widget>
       <widget objectName="immutablePage" class="QWidget" label="">
-        <widget objectName="immutableLabel" class="QLabel" label="An immutable attribute is read-only - the user is not able to modify the contents."/>
+        <widget objectName="immutableLabel" class="QLabel" label="An immutable field is read-only - the user is not able to modify the contents."/>
       </widget>
       <widget objectName="enumerationPage" class="QWidget" label="">
         <widget objectName="enumerationLabel" class="QLabel" label="Combo box with values that can be used within the column's type. Must be supported by the provider."/>
@@ -1588,7 +1588,7 @@
         <widget objectName="fileNameLabel" class="QLabel" label="Simplifies file selection by adding a file chooser dialog."/>
       </widget>
       <widget objectName="uniqueValuesPage" class="QWidget" label="">
-        <widget objectName="label" class="QLabel" label="The user can select one of the values already used in the attribute. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used."/>
+        <widget objectName="label" class="QLabel" label="The user can select one of the values already used in the field. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used."/>
         <widget objectName="editableUniqueValues" class="QCheckBox" label="Editable"/>
       </widget>
       <widget objectName="rangePage" class="QWidget" label="">
@@ -1617,7 +1617,7 @@
         <widget objectName="classificationLabel" class="QLabel" label="Displays combo box containing values of attribute used for classification."/>
       </widget>
       <widget objectName="lineEditPage" class="QWidget" label="">
-        <widget objectName="lineEditLabel" class="QLabel" label="Simple edit box. This is the default editation widget."/>
+        <widget objectName="lineEditLabel" class="QLabel" label="Simple edit box. This is the default edition widget."/>
       </widget>
       <widget objectName="calendarPage" class="QWidget" label="">
         <widget objectName="label_10" class="QLabel" label="Date format"/>
diff --git a/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp b/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp
index 252f7a10e0d..d6d695161c0 100644
--- a/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp
+++ b/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp
@@ -30,5 +30,5 @@ QgsEditorWidgetWrapper* QgsHiddenWidgetFactory::create( QgsVectorLayer* vl, int
 
 QgsEditorConfigWidget* QgsHiddenWidgetFactory::configWidget( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) const
 {
-  return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "A hidden attribute will be invisible - the user is not able to see it's contents." ) );
+  return new QgsDummyConfigDlg( vl, fieldIdx, parent, QObject::tr( "A hidden field will be invisible - the user is not able to see its contents." ) );
 }
diff --git a/src/ui/editorwidgets/qgsuniquevaluesconfigdlgbase.ui b/src/ui/editorwidgets/qgsuniquevaluesconfigdlgbase.ui
index 3d1b9597e3e..67a12609dbf 100644
--- a/src/ui/editorwidgets/qgsuniquevaluesconfigdlgbase.ui
+++ b/src/ui/editorwidgets/qgsuniquevaluesconfigdlgbase.ui
@@ -20,7 +20,7 @@
    <item row="0" column="0" colspan="2">
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>The user can select one of the values already used in the attribute. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used.</string>
+      <string>The user can select one of the values already used in the field. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
diff --git a/src/ui/qgsaddattrdialogbase.ui b/src/ui/qgsaddattrdialogbase.ui
index fbcca1737cd..d03aea8b752 100644
--- a/src/ui/qgsaddattrdialogbase.ui
+++ b/src/ui/qgsaddattrdialogbase.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>243</width>
+    <width>245</width>
     <height>201</height>
    </rect>
   </property>
diff --git a/src/ui/qgsdelattrdialogbase.ui b/src/ui/qgsdelattrdialogbase.ui
index 6069cc51967..feec8dd93a9 100644
--- a/src/ui/qgsdelattrdialogbase.ui
+++ b/src/ui/qgsdelattrdialogbase.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Delete Attributes</string>
+   <string>Delete fields</string>
   </property>
   <layout class="QGridLayout">
    <property name="leftMargin">
@@ -53,7 +53,7 @@
    <item row="2" column="0">
     <widget class="QLabel" name="mCanDeleteAttributesInfo">
      <property name="text">
-      <string>Provider does not support deleting attributes.</string>
+      <string>Provider does not support deleting fields.</string>
      </property>
     </widget>
    </item>