Skip to content

Commit dc0da6f

Browse files
nyalldawsonnyalldawson
committedMar 16, 2018
Fix some inconsistent capitalization
·
ltr-3_40final-3_2_0
1 parent 7a28181 commit dc0da6f

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
@@ -3706,9 +3706,9 @@ void QgisApp::initLayerTreeView()
37063706
btnVisibilityPresets->setMenu( QgsMapThemes::instance()->menu() );
37073707

37083708
// filter legend action
3709-
mActionFilterLegend = new QAction( tr( "Filter Legend By Map Content" ), this );
3709+
mActionFilterLegend = new QAction( tr( "Filter Legend by Map Content" ), this );
37103710
mActionFilterLegend->setCheckable( true );
3711-
mActionFilterLegend->setToolTip( tr( "Filter Legend By Map Content" ) );
3711+
mActionFilterLegend->setToolTip( tr( "Filter Legend by Map Content" ) );
37123712
mActionFilterLegend->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionFilter2.svg" ) ) );
37133713
connect( mActionFilterLegend, &QAction::toggled, this, &QgisApp::updateFilterLegend );
37143714

‎src/app/qgsoptions.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2241,11 +2241,11 @@ void QgsOptions::initContrastEnhancement( QComboBox *cbox, const QString &name,
22412241
//add items to the color enhanceContrast combo boxes
22422242
cbox->addItem( tr( "No Stretch" ),
22432243
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::NoEnhancement ) );
2244-
cbox->addItem( tr( "Stretch To MinMax" ),
2244+
cbox->addItem( tr( "Stretch to MinMax" ),
22452245
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::StretchToMinimumMaximum ) );
2246-
cbox->addItem( tr( "Stretch And Clip To MinMax" ),
2246+
cbox->addItem( tr( "Stretch and Clip to MinMax" ),
22472247
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::StretchAndClipToMinimumMaximum ) );
2248-
cbox->addItem( tr( "Clip To MinMax" ),
2248+
cbox->addItem( tr( "Clip to MinMax" ),
22492249
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::ClipToMinimumMaximum ) );
22502250

22512251
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
@@ -1776,10 +1776,10 @@
17761776
<normaloff>:/images/themes/default/mActionMoveLabel.svg</normaloff>:/images/themes/default/mActionMoveLabel.svg</iconset>
17771777
</property>
17781778
<property name="text">
1779-
<string>Move Label And Diagram</string>
1779+
<string>Move Label and Diagram</string>
17801780
</property>
17811781
<property name="toolTip">
1782-
<string>Move Label And Diagram</string>
1782+
<string>Move Label and Diagram</string>
17831783
</property>
17841784
</action>
17851785
<action name="mActionRotateLabel">
@@ -1990,7 +1990,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
19901990
<normaloff>:/images/themes/default/mActionEditCopy.svg</normaloff>:/images/themes/default/mActionEditCopy.svg</iconset>
19911991
</property>
19921992
<property name="text">
1993-
<string>Copy style</string>
1993+
<string>Copy Style</string>
1994+
</property>
1995+
<property name="toolTip">
1996+
<string>Copy Style</string>
19941997
</property>
19951998
</action>
19961999
<action name="mActionPasteStyle">
@@ -1999,7 +2002,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
19992002
<normaloff>:/images/themes/default/mActionEditPaste.svg</normaloff>:/images/themes/default/mActionEditPaste.svg</iconset>
20002003
</property>
20012004
<property name="text">
2002-
<string>Paste style</string>
2005+
<string>Paste Style</string>
2006+
</property>
2007+
<property name="toolTip">
2008+
<string>Paste Style</string>
20032009
</property>
20042010
</action>
20052011
<action name="mActionAddWcsLayer">
@@ -2035,10 +2041,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
20352041
<normaloff>:/images/themes/default/mActionPinLabels.svg</normaloff>:/images/themes/default/mActionPinLabels.svg</iconset>
20362042
</property>
20372043
<property name="text">
2038-
<string>Pin/Unpin Labels And Diagrams</string>
2044+
<string>Pin/Unpin Labels and Diagrams</string>
20392045
</property>
20402046
<property name="toolTip">
2041-
<string>Pin/Unpin Labels And Diagrams
2047+
<string>Pin/Unpin Labels and Diagrams
20422048
Click or marquee on label/diagram to pin
20432049
Shift unpins, Ctrl (Cmd) toggles state
20442050
Acts on all editable layers</string>
@@ -2053,10 +2059,10 @@ Acts on all editable layers</string>
20532059
<normaloff>:/images/themes/default/mActionShowPinnedLabels.svg</normaloff>:/images/themes/default/mActionShowPinnedLabels.svg</iconset>
20542060
</property>
20552061
<property name="text">
2056-
<string>Highlight Pinned Labels And Diagrams</string>
2062+
<string>Highlight Pinned Labels and Diagrams</string>
20572063
</property>
20582064
<property name="toolTip">
2059-
<string>Highlight Pinned Labels And Diagrams</string>
2065+
<string>Highlight Pinned Labels and Diagrams</string>
20602066
</property>
20612067
</action>
20622068
<action name="mActionNewBlankProject">
@@ -2104,7 +2110,7 @@ Acts on all editable layers</string>
21042110
<normaloff>:/images/themes/default/mActionShowHideLabels.svg</normaloff>:/images/themes/default/mActionShowHideLabels.svg</iconset>
21052111
</property>
21062112
<property name="text">
2107-
<string>Show/Hide Labels And Diagrams</string>
2113+
<string>Show/Hide Labels and Diagrams</string>
21082114
</property>
21092115
<property name="toolTip">
21102116
<string>Show/Hide Labels And Diagrams
@@ -2638,7 +2644,7 @@ Acts on currently active editable layer</string>
26382644
<string>Select Features by Value...</string>
26392645
</property>
26402646
<property name="toolTip">
2641-
<string>Select Features By Value</string>
2647+
<string>Select Features by Value</string>
26422648
</property>
26432649
<property name="shortcut">
26442650
<string>F3</string>
@@ -2725,7 +2731,7 @@ Acts on currently active editable layer</string>
27252731
<normaloff>:/images/themes/default/mActionCircleCenterPoint.svg</normaloff>:/images/themes/default/mActionCircleCenterPoint.svg</iconset>
27262732
</property>
27272733
<property name="text">
2728-
<string>&amp;Add Circle by a center point and another point</string>
2734+
<string>&amp;Add Circle by a Center Point and Another Point</string>
27292735
</property>
27302736
<property name="toolTip">
27312737
<string>Add Circle by a center point and another point</string>
@@ -2800,7 +2806,7 @@ Acts on currently active editable layer</string>
28002806
<normaloff>:/images/themes/default/mActionRectangleExtent.svg</normaloff>:/images/themes/default/mActionRectangleExtent.svg</iconset>
28012807
</property>
28022808
<property name="text">
2803-
<string>&amp;Add Rectangle From Extent</string>
2809+
<string>&amp;Add Rectangle from Extent</string>
28042810
</property>
28052811
<property name="toolTip">
28062812
<string>Add rectangle from extent</string>
@@ -2815,7 +2821,7 @@ Acts on currently active editable layer</string>
28152821
<normaloff>:/images/themes/default/mActionRectangleCenter.svg</normaloff>:/images/themes/default/mActionRectangleCenter.svg</iconset>
28162822
</property>
28172823
<property name="text">
2818-
<string>Add &amp;Rectangle From Center and a Point</string>
2824+
<string>Add &amp;Rectangle from Center and a Point</string>
28192825
</property>
28202826
<property name="toolTip">
28212827
<string>Add rectangle from center and a point</string>
@@ -2830,7 +2836,7 @@ Acts on currently active editable layer</string>
28302836
<normaloff>:/images/themes/default/mActionRegularPolygonCenterPoint.svg</normaloff>:/images/themes/default/mActionRegularPolygonCenterPoint.svg</iconset>
28312837
</property>
28322838
<property name="text">
2833-
<string>&amp;Add Regular Polygon From Center and a Point</string>
2839+
<string>&amp;Add Regular Polygon from Center and a Point</string>
28342840
</property>
28352841
<property name="toolTip">
28362842
<string>Add regular polygon from center and a point</string>
@@ -2845,7 +2851,7 @@ Acts on currently active editable layer</string>
28452851
<normaloff>:/images/themes/default/mActionRegularPolygon2Points.svg</normaloff>:/images/themes/default/mActionRegularPolygon2Points.svg</iconset>
28462852
</property>
28472853
<property name="text">
2848-
<string>Add &amp;Regular Polygon From 2 Points</string>
2854+
<string>Add &amp;Regular Polygon from 2 Points</string>
28492855
</property>
28502856
<property name="toolTip">
28512857
<string>Add regular polygon from 2 points</string>
@@ -2875,7 +2881,7 @@ Acts on currently active editable layer</string>
28752881
<normaloff>:/images/themes/default/mActionRectangle3Points.svg</normaloff>:/images/themes/default/mActionRectangle3Points.svg</iconset>
28762882
</property>
28772883
<property name="text">
2878-
<string>Add Rectangle &amp;From 3 Points</string>
2884+
<string>Add Rectangle &amp;from 3 Points</string>
28792885
</property>
28802886
<property name="toolTip">
28812887
<string>Add rectangle from 3 points</string>
@@ -2890,7 +2896,7 @@ Acts on currently active editable layer</string>
28902896
<normaloff>:/images/themes/default/mActionCircle2TangentsPoint.svg</normaloff>:/images/themes/default/mActionCircle2TangentsPoint.svg</iconset>
28912897
</property>
28922898
<property name="text">
2893-
<string>Add Circle &amp;from 2 Tangents and a point</string>
2899+
<string>Add Circle &amp;from 2 Tangents and a Point</string>
28942900
</property>
28952901
<property name="toolTip">
28962902
<string>Add circle from 2 tangents and a point</string>
@@ -2905,7 +2911,7 @@ Acts on currently active editable layer</string>
29052911
<normaloff>:/images/themes/default/mActionRegularPolygonCenterCorner.svg</normaloff>:/images/themes/default/mActionRegularPolygonCenterCorner.svg</iconset>
29062912
</property>
29072913
<property name="text">
2908-
<string>Add Regular &amp;Polygon From Center and a Corner</string>
2914+
<string>Add Regular &amp;Polygon from Center and a Corner</string>
29092915
</property>
29102916
<property name="toolTip">
29112917
<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)
Please sign in to comment.