Merge pull request #50740 from DelazJ/txIssues

qgis · Dec 17, 2022 · f591542 · f591542
2 parents 122c760 + 9f127b2
commit f591542
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 32 deletions.
diff --git a/python/plugins/db_manager/db_plugins/oracle/info_model.py b/python/plugins/db_manager/db_plugins/oracle/info_model.py
@@ -66,8 +66,7 @@ def spatialInfo(self):
             return
 
         tbl = [
-            (QApplication.translate("DBManagerPlugin", "Oracle\
-            Spatial:"),
+            (QApplication.translate("DBManagerPlugin", "Oracle Spatial:"),
              info[0])
         ]
         ret.append(HtmlTable(tbl))
@@ -77,10 +76,10 @@ def spatialInfo(self):
                 HtmlParagraph(
                     QApplication.translate(
                         "DBManagerPlugin",
-                        (u"<warning> ALL_SDO_GEOM_METADATA"
-                         u" view doesn't exist!\n"
-                         u"This view is essential for many"
-                         u"GIS applications for enumeration of tables."))))
+                        "<warning> ALL_SDO_GEOM_METADATA"
+                        " view doesn't exist!\n"
+                        "This view is essential for many"
+                        " GIS applications for enumeration of tables.")))
 
         return ret
 
@@ -177,8 +176,8 @@ def generalInfo(self):
                 "DBManagerPlugin", "Privileges:"),
                 QApplication.translate(
                 "DBManagerPlugin",
-                (u"<warning> This user doesn't have usage privileges"
-                 u"for this schema!"))))
+                "<warning> This user doesn't have usage privileges"
+                " for this schema!")))
         else:
             table_priv = self.table.database().connector.getTablePrivileges(
                 (self.table.schemaName(), self.table.name))
@@ -245,9 +244,9 @@ def getSpatialInfo(self):
             ret.append(HtmlParagraph(
                 QApplication.translate(
                     "DBManagerPlugin",
-                    (u"<warning> ALL_SDO_GEOM_METADATA table doesn't exist!\n"
-                     u"This table is essential for many GIS"
-                     u"applications for enumeration of tables."))))
+                    "<warning> ALL_SDO_GEOM_METADATA table doesn't exist!\n"
+                    "This table is essential for many GIS"
+                    " applications for enumeration of tables.")))
 
         return ret
 
@@ -379,10 +378,10 @@ def triggersDetails(self):
             HtmlParagraph(
                 QApplication.translate(
                     "DBManagerPlugin",
-                    (u'<a href="action:triggers/enable">'
-                     u'Enable all triggers</a> / '
-                     u'<a href="action:triggers/disable">'
-                     u'Disable all triggers</a>'))))
+                    '<a href="action:triggers/enable">'
+                    'Enable all triggers</a> / '
+                    '<a href="action:triggers/disable">'
+                    'Disable all triggers</a>')))
 
         return ret
 
@@ -510,11 +509,9 @@ def getMViewInfo(self):
         tbl.append((QApplication.translate("DBManagerPlugin",
                                            "Use no index:"),
                     values[9]))
-        tbl.append((QApplication.translate(
-            "DBManagerPlugin",
-            (u'<a href="action:mview/refresh">Refresh the materializ'
-             u'ed view</a>')),
-            u""))
+        tbl.append(('<a href="action:mview/refresh">{0}</a>'.format(
+            QApplication.translate("DBManagerPlugin", "Refresh the materialized view")),
+            ""))
         ret.append(HtmlTable(tbl))
 
         return ret
@@ -646,9 +643,9 @@ def spatialInfo(self):
                 HtmlParagraph(
                     QApplication.translate(
                         "DBManagerPlugin",
-                        (u'<warning> Metadata extent is different from'
-                         u'real extent. You should <a href="action:extent'
-                         u'/update">update it</a>!'))))
+                        '<warning> Metadata extent is different from'
+                        ' real extent. You should <a href="action:extent'
+                        '/update">update it</a>!')))
 
         # is there an entry in geometry_columns?
         if self.table.geomType.lower() == 'geometry':
@@ -665,8 +662,8 @@ def spatialInfo(self):
                     HtmlParagraph(
                         QApplication.translate(
                             "DBManagerPlugin",
-                            (u'<warning> No spatial index defined (<a href='
-                             u'"action:spatialindex/create">'
-                             u'create it</a>).'))))
+                            '<warning> No spatial index defined (<a href='
+                            '"action:spatialindex/create">'
+                            'create it</a>).')))
 
         return ret
diff --git a/python/pyplugin_installer/installer_data.py b/python/pyplugin_installer/installer_data.py
@@ -445,7 +445,7 @@ def xmlDownloaded(self):
                 # no plugin metadata found
                 self.mRepositories[reposName]["state"] = Repositories.STATE_UNAVAILABLE
                 if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200:
-                    self.mRepositories[reposName]["error"] = QCoreApplication.translate("QgsPluginInstaller", "Server response is 200 OK, but doesn't contain plugin metatada. This is most likely caused by a proxy or a wrong repository URL. You can configure proxy settings in QGIS options.")
+                    self.mRepositories[reposName]["error"] = QCoreApplication.translate("QgsPluginInstaller", "Server response is 200 OK, but doesn't contain plugin metadata. This is most likely caused by a proxy or a wrong repository URL. You can configure proxy settings in QGIS options.")
                 else:
                     self.mRepositories[reposName]["error"] = QCoreApplication.translate("QgsPluginInstaller", "Status code:") + " {} {}".format(
                         reply.attribute(QNetworkRequest.HttpStatusCodeAttribute),

diff --git a/scripts/spell_check/spelling.dat b/scripts/spell_check/spelling.dat
@@ -4517,6 +4517,7 @@ metalurgical:metallurgical
 metalurgy:metallurgy
 metamorphysis:metamorphosis
 metaphoricial:metaphorical
+metatada:metadata
 metdata:metadata
 meterologist:meteorologist
 meterology:meteorology

diff --git a/src/analysis/processing/qgsalgorithmboundary.cpp b/src/analysis/processing/qgsalgorithmboundary.cpp
@@ -116,7 +116,7 @@ QgsFeatureList QgsBoundaryAlgorithm::processFeature( const QgsFeature &feature,
     const QgsGeometry outputGeometry = QgsGeometry( inputGeometry.constGet()->boundary() );
     if ( outputGeometry.isNull() )
     {
-      feedback->reportError( QObject::tr( "No boundary for feature %1 (possibly a closed linestring?)'" ).arg( feature.id() ) );
+      feedback->reportError( QObject::tr( "No boundary for feature %1 (possibly a closed linestring?)" ).arg( feature.id() ) );
       outFeature.clearGeometry();
     }
     else

diff --git a/src/analysis/processing/qgsalgorithmsegmentize.cpp b/src/analysis/processing/qgsalgorithmsegmentize.cpp
@@ -52,7 +52,7 @@ QString QgsSegmentizeByMaximumDistanceAlgorithm::outputName() const
 QString QgsSegmentizeByMaximumDistanceAlgorithm::shortHelpString() const
 {
   return QObject::tr( "This algorithm segmentizes a geometry by converting curved sections to linear sections.\n\n"
-                      "The segmentization is performed by specifying the maximum allowed offset distance between the original"
+                      "The segmentization is performed by specifying the maximum allowed offset distance between the original "
                       "curve and the segmentized representation.\n\n"
                       "Non-curved geometries will be retained without change." );
 }

diff --git a/src/app/dwg/qgsdwgimporter.cpp b/src/app/dwg/qgsdwgimporter.cpp
@@ -1589,7 +1589,7 @@ void QgsDwgImporter::addArc( const DRW_Arc &data )
   QgsCircularString c;
   if ( !circularStringFromArc( data, c ) )
   {
-    LOG( tr( "Could not create circular string from  %2 [%1]" )
+    LOG( tr( "Could not create circular string from %2 [%1]" )
          .arg( QString::fromUtf8( CPLGetLastErrorMsg() ), tr( "arc" ) )
        );
     return;

diff --git a/src/ui/editorwidgets/qgsrelationreferenceconfigdlgbase.ui b/src/ui/editorwidgets/qgsrelationreferenceconfigdlgbase.ui
@@ -122,7 +122,7 @@
       <item row="5" column="0" colspan="3">
        <widget class="QCheckBox" name="mCbxChainFilters">
         <property name="toolTip">
-         <string>When activated, the filters will restrict the choices of fields to options that are </string>
+         <string>When activated, filters restrict the option of subsequent filters based on the selection of a previous filter.</string>
         </property>
         <property name="text">
          <string>Chain filters</string>

diff --git a/src/ui/qgsabout.ui b/src/ui/qgsabout.ui
@@ -398,7 +398,7 @@
             <widget class="QgsWebView" name="txtTranslators" native="true">
              <property name="url" stdset="0">
               <url>
-               <string>about:blank</string>
+               <string notr="true">about:blank</string>
               </url>
              </property>
             </widget>