fix typos

qgis · Sep 26, 2015 · 0a51b13 · 0a51b13
1 parent 272dd9c
commit 0a51b13
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/src/core/auth/qgsauthmanager.cpp b/src/core/auth/qgsauthmanager.cpp
@@ -1625,15 +1625,15 @@ const QPair<QSslCertificate, QSslKey> QgsAuthManager::getCertIdentityBundle( con
                       QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey );
       if ( key.isNull() )
       {
-        const char* err = QT_TR_NOOP( "Retieve certificate identity bundle: FAILED to create private key" );
+        const char* err = QT_TR_NOOP( "Retrieve certificate identity bundle: FAILED to create private key" );
         QgsDebugMsg( err );
         emit messageOut( tr( err ), authManTag(), WARNING );
         return bundle;
       }
       cert = QSslCertificate( query.value( 1 ).toByteArray(), QSsl::Pem );
       if ( cert.isNull() )
       {
-        const char* err = QT_TR_NOOP( "Retieve certificate identity bundle: FAILED to create certificate" );
+        const char* err = QT_TR_NOOP( "Retrieve certificate identity bundle: FAILED to create certificate" );
         QgsDebugMsg( err );
         emit messageOut( tr( err ), authManTag(), WARNING );
         return bundle;

diff --git a/src/gui/auth/qgsauthcertificateinfo.cpp b/src/gui/auth/qgsauthcertificateinfo.cpp
@@ -69,9 +69,9 @@ QgsAuthCertInfo::QgsAuthCertInfo( QSslCertificate cert,
 
   lblError->setHidden( true );
 
-  treeHeirarchy->setRootIsDecorated( false );
+  treeHierarchy->setRootIsDecorated( false );
 
-  connect( treeHeirarchy, SIGNAL( currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ) ),
+  connect( treeHierarchy, SIGNAL( currentItemChanged( QTreeWidgetItem *, QTreeWidgetItem * ) ),
            this, SLOT( currentCertItemChanged( QTreeWidgetItem*, QTreeWidgetItem* ) ) );
 
   mCaCertsCache = QgsAuthManager::instance()->getCaCertsCache();
@@ -91,7 +91,7 @@ QgsAuthCertInfo::QgsAuthCertInfo( QSslCertificate cert,
   if ( res )
     res = populateCertChain();
   if ( res )
-    setCertHeirarchy();
+    setCertHierarchy();
 
   connect( cmbbxTrust, SIGNAL( currentIndexChanged( int ) ),
            this, SLOT( currentPolicyIndexChanged( int ) ) );
@@ -119,7 +119,7 @@ void QgsAuthCertInfo::currentCertItemChanged( QTreeWidgetItem *current, QTreeWid
 void QgsAuthCertInfo::updateCurrentCert( QTreeWidgetItem *item )
 {
   if ( !item )
-    item = treeHeirarchy->currentItem();
+    item = treeHierarchy->currentItem();
   if ( !item )
     return;
 
@@ -210,7 +210,7 @@ bool QgsAuthCertInfo::populateCertChain()
   return true;
 }
 
-void QgsAuthCertInfo::setCertHeirarchy()
+void QgsAuthCertInfo::setCertHierarchy()
 {
   QListIterator<QSslCertificate> it( mQCertChain );
   it.toBack();
@@ -245,7 +245,7 @@ void QgsAuthCertInfo::setCertHeirarchy()
 
     if ( !previtem )
     {
-      item = new QTreeWidgetItem( treeHeirarchy, QStringList() << cert_source );
+      item = new QTreeWidgetItem( treeHierarchy, QStringList() << cert_source );
     }
     else
     {
@@ -267,11 +267,11 @@ void QgsAuthCertInfo::setCertHeirarchy()
 
     item->setFirstColumnSpanned( true );
     if ( !previtem )
-      treeHeirarchy->addTopLevelItem( item );
+      treeHierarchy->addTopLevelItem( item );
     previtem = item;
   }
-  treeHeirarchy->setCurrentItem( item, 0, QItemSelectionModel::ClearAndSelect );
-  treeHeirarchy->expandAll();
+  treeHierarchy->setCurrentItem( item, 0, QItemSelectionModel::ClearAndSelect );
+  treeHierarchy->expandAll();
 }
 
 void QgsAuthCertInfo::updateCurrentCertInfo( int chainindx )
@@ -857,7 +857,7 @@ void QgsAuthCertInfo::decorateCertTreeItem( const QSslCertificate &cert,
 {
   if ( !item )
   {
-    item = treeHeirarchy->currentItem();
+    item = treeHierarchy->currentItem();
   }
   if ( !item )
   {

diff --git a/src/gui/auth/qgsauthcertificateinfo.h b/src/gui/auth/qgsauthcertificateinfo.h
@@ -84,7 +84,7 @@ class GUI_EXPORT QgsAuthCertInfo : public QWidget, private Ui::QgsAuthCertInfo
 
     bool populateCertChain();
 
-    void setCertHeirarchy();
+    void setCertHierarchy();
 
     void updateCurrentCertInfo( int chainindx );
 

diff --git a/src/ui/auth/qgsauthcertificateinfo.ui b/src/ui/auth/qgsauthcertificateinfo.ui
@@ -36,15 +36,15 @@
     <number>6</number>
    </property>
    <item>
-    <widget class="QGroupBox" name="grpbxHeirarchy">
+    <widget class="QGroupBox" name="grpbxHierarchy">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
      <property name="title">
-      <string>Certificate Heirarchy</string>
+      <string>Certificate Hierarchy</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_4">
       <property name="leftMargin">
@@ -60,7 +60,7 @@
        <number>3</number>
       </property>
       <item>
-       <widget class="QTreeWidget" name="treeHeirarchy">
+       <widget class="QTreeWidget" name="treeHierarchy">
         <property name="minimumSize">
          <size>
           <width>600</width>

diff --git a/src/ui/auth/qgsauthimportcertdialog.ui b/src/ui/auth/qgsauthimportcertdialog.ui
@@ -98,7 +98,7 @@
            <string notr="true">color: rgb(128, 128, 128);</string>
           </property>
           <property name="text">
-           <string>Import(s) can contain mutiple certificates</string>
+           <string>Import(s) can contain multiple certificates</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>

diff --git a/src/ui/auth/qgsauthimportidentitydialog.ui b/src/ui/auth/qgsauthimportidentitydialog.ui
@@ -26,7 +26,7 @@
       </sizepolicy>
      </property>
      <property name="title">
-      <string>Import identity</string>
+      <string>Import Identity</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="leftMargin">