Skip to content

Commit c167567

Browse files
committed
Fix some inconsistent capitalization
(cherry-picked from dc0da6f)
1 parent 263beb4 commit c167567

File tree

6 files changed

+36
-30
lines changed

6 files changed

+36
-30
lines changed

src/app/qgisapp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3663,9 +3663,9 @@ void QgisApp::initLayerTreeView()
36633663
btnVisibilityPresets->setMenu( QgsMapThemes::instance()->menu() );
36643664

36653665
// filter legend action
3666-
mActionFilterLegend = new QAction( tr( "Filter Legend By Map Content" ), this );
3666+
mActionFilterLegend = new QAction( tr( "Filter Legend by Map Content" ), this );
36673667
mActionFilterLegend->setCheckable( true );
3668-
mActionFilterLegend->setToolTip( tr( "Filter Legend By Map Content" ) );
3668+
mActionFilterLegend->setToolTip( tr( "Filter Legend by Map Content" ) );
36693669
mActionFilterLegend->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionFilter2.svg" ) ) );
36703670
connect( mActionFilterLegend, &QAction::toggled, this, &QgisApp::updateFilterLegend );
36713671

src/app/qgsoptions.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2164,11 +2164,11 @@ void QgsOptions::initContrastEnhancement( QComboBox *cbox, const QString &name,
21642164
//add items to the color enhanceContrast combo boxes
21652165
cbox->addItem( tr( "No Stretch" ),
21662166
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::NoEnhancement ) );
2167-
cbox->addItem( tr( "Stretch To MinMax" ),
2167+
cbox->addItem( tr( "Stretch to MinMax" ),
21682168
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::StretchToMinimumMaximum ) );
2169-
cbox->addItem( tr( "Stretch And Clip To MinMax" ),
2169+
cbox->addItem( tr( "Stretch and Clip to MinMax" ),
21702170
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::StretchAndClipToMinimumMaximum ) );
2171-
cbox->addItem( tr( "Clip To MinMax" ),
2171+
cbox->addItem( tr( "Clip to MinMax" ),
21722172
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::ClipToMinimumMaximum ) );
21732173

21742174
QString contrastEnhancement = mSettings->value( "/Raster/defaultContrastEnhancementAlgorithm/" + name, defaultVal ).toString();

src/core/auth/qgsauthcertutils.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,11 +1150,11 @@ QString QgsAuthCertUtils::sslErrorEnumString( QSslError::SslError errenum )
11501150
switch ( errenum )
11511151
{
11521152
case QSslError::UnableToGetIssuerCertificate:
1153-
return QObject::tr( "Unable To Get Issuer Certificate" );
1153+
return QObject::tr( "Unable to Get Issuer Certificate" );
11541154
case QSslError::UnableToDecryptCertificateSignature:
1155-
return QObject::tr( "Unable To Decrypt Certificate Signature" );
1155+
return QObject::tr( "Unable to Decrypt Certificate Signature" );
11561156
case QSslError::UnableToDecodeIssuerPublicKey:
1157-
return QObject::tr( "Unable To Decode Issuer Public Key" );
1157+
return QObject::tr( "Unable to Decode Issuer Public Key" );
11581158
case QSslError::CertificateSignatureFailed:
11591159
return QObject::tr( "Certificate Signature Failed" );
11601160
case QSslError::CertificateNotYetValid:
@@ -1170,9 +1170,9 @@ QString QgsAuthCertUtils::sslErrorEnumString( QSslError::SslError errenum )
11701170
case QSslError::SelfSignedCertificateInChain:
11711171
return QObject::tr( "Self-signed Certificate In Chain" );
11721172
case QSslError::UnableToGetLocalIssuerCertificate:
1173-
return QObject::tr( "Unable To Get Local Issuer Certificate" );
1173+
return QObject::tr( "Unable to Get Local Issuer Certificate" );
11741174
case QSslError::UnableToVerifyFirstCertificate:
1175-
return QObject::tr( "Unable To Verify First Certificate" );
1175+
return QObject::tr( "Unable to Verify First Certificate" );
11761176
case QSslError::CertificateRevoked:
11771177
return QObject::tr( "Certificate Revoked" );
11781178
case QSslError::InvalidCaCertificate:

src/ui/layout/qgslayoutlegendwidgetbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@
383383
<item>
384384
<widget class="QToolButton" name="mFilterByMapToolButton">
385385
<property name="toolTip">
386-
<string>Filter Legend By Map Content</string>
386+
<string>Filter Legend by Map Content</string>
387387
</property>
388388
<property name="icon">
389389
<iconset resource="../../../images/images.qrc">

src/ui/qgisapp.ui

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1774,10 +1774,10 @@
17741774
<normaloff>:/images/themes/default/mActionMoveLabel.svg</normaloff>:/images/themes/default/mActionMoveLabel.svg</iconset>
17751775
</property>
17761776
<property name="text">
1777-
<string>Move Label And Diagram</string>
1777+
<string>Move Label and Diagram</string>
17781778
</property>
17791779
<property name="toolTip">
1780-
<string>Move Label And Diagram</string>
1780+
<string>Move Label and Diagram</string>
17811781
</property>
17821782
</action>
17831783
<action name="mActionRotateLabel">
@@ -1988,7 +1988,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
19881988
<normaloff>:/images/themes/default/mActionEditCopy.svg</normaloff>:/images/themes/default/mActionEditCopy.svg</iconset>
19891989
</property>
19901990
<property name="text">
1991-
<string>Copy style</string>
1991+
<string>Copy Style</string>
1992+
</property>
1993+
<property name="toolTip">
1994+
<string>Copy Style</string>
19921995
</property>
19931996
</action>
19941997
<action name="mActionPasteStyle">
@@ -1997,7 +2000,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
19972000
<normaloff>:/images/themes/default/mActionEditPaste.svg</normaloff>:/images/themes/default/mActionEditPaste.svg</iconset>
19982001
</property>
19992002
<property name="text">
2000-
<string>Paste style</string>
2003+
<string>Paste Style</string>
2004+
</property>
2005+
<property name="toolTip">
2006+
<string>Paste Style</string>
20012007
</property>
20022008
</action>
20032009
<action name="mActionAddWcsLayer">
@@ -2033,10 +2039,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
20332039
<normaloff>:/images/themes/default/mActionPinLabels.svg</normaloff>:/images/themes/default/mActionPinLabels.svg</iconset>
20342040
</property>
20352041
<property name="text">
2036-
<string>Pin/Unpin Labels And Diagrams</string>
2042+
<string>Pin/Unpin Labels and Diagrams</string>
20372043
</property>
20382044
<property name="toolTip">
2039-
<string>Pin/Unpin Labels And Diagrams
2045+
<string>Pin/Unpin Labels and Diagrams
20402046
Click or marquee on label/diagram to pin
20412047
Shift unpins, Ctrl (Cmd) toggles state
20422048
Acts on all editable layers</string>
@@ -2051,10 +2057,10 @@ Acts on all editable layers</string>
20512057
<normaloff>:/images/themes/default/mActionShowPinnedLabels.svg</normaloff>:/images/themes/default/mActionShowPinnedLabels.svg</iconset>
20522058
</property>
20532059
<property name="text">
2054-
<string>Highlight Pinned Labels And Diagrams</string>
2060+
<string>Highlight Pinned Labels and Diagrams</string>
20552061
</property>
20562062
<property name="toolTip">
2057-
<string>Highlight Pinned Labels And Diagrams</string>
2063+
<string>Highlight Pinned Labels and Diagrams</string>
20582064
</property>
20592065
</action>
20602066
<action name="mActionNewBlankProject">
@@ -2102,7 +2108,7 @@ Acts on all editable layers</string>
21022108
<normaloff>:/images/themes/default/mActionShowHideLabels.svg</normaloff>:/images/themes/default/mActionShowHideLabels.svg</iconset>
21032109
</property>
21042110
<property name="text">
2105-
<string>Show/Hide Labels And Diagrams</string>
2111+
<string>Show/Hide Labels and Diagrams</string>
21062112
</property>
21072113
<property name="toolTip">
21082114
<string>Show/Hide Labels And Diagrams
@@ -2636,7 +2642,7 @@ Acts on currently active editable layer</string>
26362642
<string>Select Features by Value...</string>
26372643
</property>
26382644
<property name="toolTip">
2639-
<string>Select Features By Value</string>
2645+
<string>Select Features by Value</string>
26402646
</property>
26412647
<property name="shortcut">
26422648
<string>F3</string>
@@ -2723,7 +2729,7 @@ Acts on currently active editable layer</string>
27232729
<normaloff>:/images/themes/default/mActionCircleCenterPoint.svg</normaloff>:/images/themes/default/mActionCircleCenterPoint.svg</iconset>
27242730
</property>
27252731
<property name="text">
2726-
<string>&amp;Add Circle by a center point and another point</string>
2732+
<string>&amp;Add Circle by a Center Point and Another Point</string>
27272733
</property>
27282734
<property name="toolTip">
27292735
<string>Add Circle by a center point and another point</string>
@@ -2798,7 +2804,7 @@ Acts on currently active editable layer</string>
27982804
<normaloff>:/images/themes/default/mActionRectangleExtent.svg</normaloff>:/images/themes/default/mActionRectangleExtent.svg</iconset>
27992805
</property>
28002806
<property name="text">
2801-
<string>&amp;Add Rectangle From Extent</string>
2807+
<string>&amp;Add Rectangle from Extent</string>
28022808
</property>
28032809
<property name="toolTip">
28042810
<string>Add rectangle from extent</string>
@@ -2813,7 +2819,7 @@ Acts on currently active editable layer</string>
28132819
<normaloff>:/images/themes/default/mActionRectangleCenter.svg</normaloff>:/images/themes/default/mActionRectangleCenter.svg</iconset>
28142820
</property>
28152821
<property name="text">
2816-
<string>Add &amp;Rectangle From Center and a Point</string>
2822+
<string>Add &amp;Rectangle from Center and a Point</string>
28172823
</property>
28182824
<property name="toolTip">
28192825
<string>Add rectangle from center and a point</string>
@@ -2828,7 +2834,7 @@ Acts on currently active editable layer</string>
28282834
<normaloff>:/images/themes/default/mActionRegularPolygonCenterPoint.svg</normaloff>:/images/themes/default/mActionRegularPolygonCenterPoint.svg</iconset>
28292835
</property>
28302836
<property name="text">
2831-
<string>&amp;Add Regular Polygon From Center and a Point</string>
2837+
<string>&amp;Add Regular Polygon from Center and a Point</string>
28322838
</property>
28332839
<property name="toolTip">
28342840
<string>Add regular polygon from center and a point</string>
@@ -2843,7 +2849,7 @@ Acts on currently active editable layer</string>
28432849
<normaloff>:/images/themes/default/mActionRegularPolygon2Points.svg</normaloff>:/images/themes/default/mActionRegularPolygon2Points.svg</iconset>
28442850
</property>
28452851
<property name="text">
2846-
<string>Add &amp;Regular Polygon From 2 Points</string>
2852+
<string>Add &amp;Regular Polygon from 2 Points</string>
28472853
</property>
28482854
<property name="toolTip">
28492855
<string>Add regular polygon from 2 points</string>
@@ -2873,7 +2879,7 @@ Acts on currently active editable layer</string>
28732879
<normaloff>:/images/themes/default/mActionRectangle3Points.svg</normaloff>:/images/themes/default/mActionRectangle3Points.svg</iconset>
28742880
</property>
28752881
<property name="text">
2876-
<string>Add Rectangle &amp;From 3 Points</string>
2882+
<string>Add Rectangle &amp;from 3 Points</string>
28772883
</property>
28782884
<property name="toolTip">
28792885
<string>Add rectangle from 3 points</string>
@@ -2888,7 +2894,7 @@ Acts on currently active editable layer</string>
28882894
<normaloff>:/images/themes/default/mActionCircle2TangentsPoint.svg</normaloff>:/images/themes/default/mActionCircle2TangentsPoint.svg</iconset>
28892895
</property>
28902896
<property name="text">
2891-
<string>Add Circle &amp;from 2 Tangents and a point</string>
2897+
<string>Add Circle &amp;from 2 Tangents and a Point</string>
28922898
</property>
28932899
<property name="toolTip">
28942900
<string>Add circle from 2 tangents and a point</string>
@@ -2903,7 +2909,7 @@ Acts on currently active editable layer</string>
29032909
<normaloff>:/images/themes/default/mActionRegularPolygonCenterCorner.svg</normaloff>:/images/themes/default/mActionRegularPolygonCenterCorner.svg</iconset>
29042910
</property>
29052911
<property name="text">
2906-
<string>Add Regular &amp;Polygon From Center and a Corner</string>
2912+
<string>Add Regular &amp;Polygon from Center and a Corner</string>
29072913
</property>
29082914
<property name="toolTip">
29092915
<string>Add regular polygon from center and a corner</string>

src/ui/qgsexpressionselectiondialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
14-
<string>Select By Expression</string>
14+
<string>Select by Expression</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
1717
<property name="leftMargin">

0 commit comments

Comments
 (0)