Skip to content

Commit

Permalink
Fix some inconsistent capitalization
Browse files Browse the repository at this point in the history 
(cherry-picked from dc0da6f)
  • Loading branch information
@nyalldawson
nyalldawson committed Mar 16, 2018
1 parent 263beb4 commit c167567
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 30 deletions.
4 changes: 2 additions & 2 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -3663,9 +3663,9 @@ void QgisApp::initLayerTreeView()
btnVisibilityPresets->setMenu( QgsMapThemes::instance()->menu() );

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

Expand Down
6 changes: 3 additions & 3 deletions src/app/qgsoptions.cpp
View file
Expand Up @@ -2164,11 +2164,11 @@ void QgsOptions::initContrastEnhancement( QComboBox *cbox, const QString &name,
//add items to the color enhanceContrast combo boxes
cbox->addItem( tr( "No Stretch" ),
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::NoEnhancement ) );
cbox->addItem( tr( "Stretch To MinMax" ),
cbox->addItem( tr( "Stretch to MinMax" ),
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::StretchToMinimumMaximum ) );
cbox->addItem( tr( "Stretch And Clip To MinMax" ),
cbox->addItem( tr( "Stretch and Clip to MinMax" ),
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::StretchAndClipToMinimumMaximum ) );
cbox->addItem( tr( "Clip To MinMax" ),
cbox->addItem( tr( "Clip to MinMax" ),
QgsContrastEnhancement::contrastEnhancementAlgorithmString( QgsContrastEnhancement::ClipToMinimumMaximum ) );

QString contrastEnhancement = mSettings->value( "/Raster/defaultContrastEnhancementAlgorithm/" + name, defaultVal ).toString();
Expand Down
10 changes: 5 additions & 5 deletions src/core/auth/qgsauthcertutils.cpp
View file
Expand Up @@ -1150,11 +1150,11 @@ QString QgsAuthCertUtils::sslErrorEnumString( QSslError::SslError errenum )
switch ( errenum )
{
case QSslError::UnableToGetIssuerCertificate:
return QObject::tr( "Unable To Get Issuer Certificate" );
return QObject::tr( "Unable to Get Issuer Certificate" );
case QSslError::UnableToDecryptCertificateSignature:
return QObject::tr( "Unable To Decrypt Certificate Signature" );
return QObject::tr( "Unable to Decrypt Certificate Signature" );
case QSslError::UnableToDecodeIssuerPublicKey:
return QObject::tr( "Unable To Decode Issuer Public Key" );
return QObject::tr( "Unable to Decode Issuer Public Key" );
case QSslError::CertificateSignatureFailed:
return QObject::tr( "Certificate Signature Failed" );
case QSslError::CertificateNotYetValid:
Expand All @@ -1170,9 +1170,9 @@ QString QgsAuthCertUtils::sslErrorEnumString( QSslError::SslError errenum )
case QSslError::SelfSignedCertificateInChain:
return QObject::tr( "Self-signed Certificate In Chain" );
case QSslError::UnableToGetLocalIssuerCertificate:
return QObject::tr( "Unable To Get Local Issuer Certificate" );
return QObject::tr( "Unable to Get Local Issuer Certificate" );
case QSslError::UnableToVerifyFirstCertificate:
return QObject::tr( "Unable To Verify First Certificate" );
return QObject::tr( "Unable to Verify First Certificate" );
case QSslError::CertificateRevoked:
return QObject::tr( "Certificate Revoked" );
case QSslError::InvalidCaCertificate:
Expand Down
2 changes: 1 addition & 1 deletion src/ui/layout/qgslayoutlegendwidgetbase.ui
View file
Expand Up @@ -383,7 +383,7 @@
<item>
<widget class="QToolButton" name="mFilterByMapToolButton">
<property name="toolTip">
<string>Filter Legend By Map Content</string>
<string>Filter Legend by Map Content</string>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
Expand Down
42 changes: 24 additions & 18 deletions src/ui/qgisapp.ui
View file
Expand Up @@ -1774,10 +1774,10 @@
<normaloff>:/images/themes/default/mActionMoveLabel.svg</normaloff>:/images/themes/default/mActionMoveLabel.svg</iconset>
</property>
<property name="text">
<string>Move Label And Diagram</string>
<string>Move Label and Diagram</string>
</property>
<property name="toolTip">
<string>Move Label And Diagram</string>
<string>Move Label and Diagram</string>
</property>
</action>
<action name="mActionRotateLabel">
Expand Down Expand Up @@ -1988,7 +1988,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
<normaloff>:/images/themes/default/mActionEditCopy.svg</normaloff>:/images/themes/default/mActionEditCopy.svg</iconset>
</property>
<property name="text">
<string>Copy style</string>
<string>Copy Style</string>
</property>
<property name="toolTip">
<string>Copy Style</string>
</property>
</action>
<action name="mActionPasteStyle">
Expand All @@ -1997,7 +2000,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
<normaloff>:/images/themes/default/mActionEditPaste.svg</normaloff>:/images/themes/default/mActionEditPaste.svg</iconset>
</property>
<property name="text">
<string>Paste style</string>
<string>Paste Style</string>
</property>
<property name="toolTip">
<string>Paste Style</string>
</property>
</action>
<action name="mActionAddWcsLayer">
Expand Down Expand Up @@ -2033,10 +2039,10 @@ Ctrl (Cmd) increments by 15 deg.</string>
<normaloff>:/images/themes/default/mActionPinLabels.svg</normaloff>:/images/themes/default/mActionPinLabels.svg</iconset>
</property>
<property name="text">
<string>Pin/Unpin Labels And Diagrams</string>
<string>Pin/Unpin Labels and Diagrams</string>
</property>
<property name="toolTip">
<string>Pin/Unpin Labels And Diagrams
<string>Pin/Unpin Labels and Diagrams
Click or marquee on label/diagram to pin
Shift unpins, Ctrl (Cmd) toggles state
Acts on all editable layers</string>
Expand All @@ -2051,10 +2057,10 @@ Acts on all editable layers</string>
<normaloff>:/images/themes/default/mActionShowPinnedLabels.svg</normaloff>:/images/themes/default/mActionShowPinnedLabels.svg</iconset>
</property>
<property name="text">
<string>Highlight Pinned Labels And Diagrams</string>
<string>Highlight Pinned Labels and Diagrams</string>
</property>
<property name="toolTip">
<string>Highlight Pinned Labels And Diagrams</string>
<string>Highlight Pinned Labels and Diagrams</string>
</property>
</action>
<action name="mActionNewBlankProject">
Expand Down Expand Up @@ -2102,7 +2108,7 @@ Acts on all editable layers</string>
<normaloff>:/images/themes/default/mActionShowHideLabels.svg</normaloff>:/images/themes/default/mActionShowHideLabels.svg</iconset>
</property>
<property name="text">
<string>Show/Hide Labels And Diagrams</string>
<string>Show/Hide Labels and Diagrams</string>
</property>
<property name="toolTip">
<string>Show/Hide Labels And Diagrams
Expand Down Expand Up @@ -2636,7 +2642,7 @@ Acts on currently active editable layer</string>
<string>Select Features by Value...</string>
</property>
<property name="toolTip">
<string>Select Features By Value</string>
<string>Select Features by Value</string>
</property>
<property name="shortcut">
<string>F3</string>
Expand Down Expand Up @@ -2723,7 +2729,7 @@ Acts on currently active editable layer</string>
<normaloff>:/images/themes/default/mActionCircleCenterPoint.svg</normaloff>:/images/themes/default/mActionCircleCenterPoint.svg</iconset>
</property>
<property name="text">
<string>&amp;Add Circle by a center point and another point</string>
<string>&amp;Add Circle by a Center Point and Another Point</string>
</property>
<property name="toolTip">
<string>Add Circle by a center point and another point</string>
Expand Down Expand Up @@ -2798,7 +2804,7 @@ Acts on currently active editable layer</string>
<normaloff>:/images/themes/default/mActionRectangleExtent.svg</normaloff>:/images/themes/default/mActionRectangleExtent.svg</iconset>
</property>
<property name="text">
<string>&amp;Add Rectangle From Extent</string>
<string>&amp;Add Rectangle from Extent</string>
</property>
<property name="toolTip">
<string>Add rectangle from extent</string>
Expand All @@ -2813,7 +2819,7 @@ Acts on currently active editable layer</string>
<normaloff>:/images/themes/default/mActionRectangleCenter.svg</normaloff>:/images/themes/default/mActionRectangleCenter.svg</iconset>
</property>
<property name="text">
<string>Add &amp;Rectangle From Center and a Point</string>
<string>Add &amp;Rectangle from Center and a Point</string>
</property>
<property name="toolTip">
<string>Add rectangle from center and a point</string>
Expand All @@ -2828,7 +2834,7 @@ Acts on currently active editable layer</string>
<normaloff>:/images/themes/default/mActionRegularPolygonCenterPoint.svg</normaloff>:/images/themes/default/mActionRegularPolygonCenterPoint.svg</iconset>
</property>
<property name="text">
<string>&amp;Add Regular Polygon From Center and a Point</string>
<string>&amp;Add Regular Polygon from Center and a Point</string>
</property>
<property name="toolTip">
<string>Add regular polygon from center and a point</string>
Expand All @@ -2843,7 +2849,7 @@ Acts on currently active editable layer</string>
<normaloff>:/images/themes/default/mActionRegularPolygon2Points.svg</normaloff>:/images/themes/default/mActionRegularPolygon2Points.svg</iconset>
</property>
<property name="text">
<string>Add &amp;Regular Polygon From 2 Points</string>
<string>Add &amp;Regular Polygon from 2 Points</string>
</property>
<property name="toolTip">
<string>Add regular polygon from 2 points</string>
Expand Down Expand Up @@ -2873,7 +2879,7 @@ Acts on currently active editable layer</string>
<normaloff>:/images/themes/default/mActionRectangle3Points.svg</normaloff>:/images/themes/default/mActionRectangle3Points.svg</iconset>
</property>
<property name="text">
<string>Add Rectangle &amp;From 3 Points</string>
<string>Add Rectangle &amp;from 3 Points</string>
</property>
<property name="toolTip">
<string>Add rectangle from 3 points</string>
Expand All @@ -2888,7 +2894,7 @@ Acts on currently active editable layer</string>
<normaloff>:/images/themes/default/mActionCircle2TangentsPoint.svg</normaloff>:/images/themes/default/mActionCircle2TangentsPoint.svg</iconset>
</property>
<property name="text">
<string>Add Circle &amp;from 2 Tangents and a point</string>
<string>Add Circle &amp;from 2 Tangents and a Point</string>
</property>
<property name="toolTip">
<string>Add circle from 2 tangents and a point</string>
Expand All @@ -2903,7 +2909,7 @@ Acts on currently active editable layer</string>
<normaloff>:/images/themes/default/mActionRegularPolygonCenterCorner.svg</normaloff>:/images/themes/default/mActionRegularPolygonCenterCorner.svg</iconset>
</property>
<property name="text">
<string>Add Regular &amp;Polygon From Center and a Corner</string>
<string>Add Regular &amp;Polygon from Center and a Corner</string>
</property>
<property name="toolTip">
<string>Add regular polygon from center and a corner</string>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsexpressionselectiondialogbase.ui
View file
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Select By Expression</string>
<string>Select by Expression</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
Expand Down

0 comments on commit c167567

Please sign in to comment.