Skip to content

Commit

Permalink
Full sentence should often begin by capitalized letter
Browse files Browse the repository at this point in the history 
and end by a full stop.
  • Loading branch information
@DelazJ
DelazJ committed Oct 26, 2017
1 parent f5025cc commit c2577ec
Show file tree
Hide file tree
Showing 18 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion python/plugins/MetaSearch/dialogs/manageconnectionsdialog.py
View file
Expand Up @@ -134,7 +134,7 @@ def save(self, connections):
with open(self.filename, 'w') as fileobj:
fileobj.write(prettify_xml(etree.tostring(doc)))
QMessageBox.information(self, self.tr('Save Connections'),
self.tr('Saved to {0}').format(self.filename))
self.tr('Saved to {0}.').format(self.filename))
self.reject()

def load(self, items):
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/db_manager/dlg_table_properties.py
View file
Expand Up @@ -272,7 +272,7 @@ def createIndex(self):
def createSpatialIndex(self):
""" create spatial index for the geometry column """
if self.table.type != self.table.VectorType:
QMessageBox.information(self, self.tr("DB Manager"), self.tr("The selected table has no geometry"))
QMessageBox.information(self, self.tr("DB Manager"), self.tr("The selected table has no geometry."))
return

res = QMessageBox.question(self, self.tr("Create Spatial Index"),
Expand Down
20 changes: 10 additions & 10 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -4027,7 +4027,7 @@ void QgisApp::about()
#ifdef HAVE_POSTGRESQL
versionString += PG_VERSION;
#else
versionString += tr( "No support." );
versionString += tr( "No support" );
#endif
versionString += QLatin1String( "</td>" );

Expand Down Expand Up @@ -4185,14 +4185,14 @@ bool QgisApp::addVectorLayers( const QStringList &layerQStringList, const QStrin
}
else
{
QString msg = tr( "%1 doesn't have any layers" ).arg( src );
QString msg = tr( "%1 doesn't have any layers." ).arg( src );
messageBar()->pushMessage( tr( "Invalid Data Source" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );
delete layer;
}
}
else
{
QString msg = tr( "%1 is not a valid or recognized data source" ).arg( src );
QString msg = tr( "%1 is not a valid or recognized data source." ).arg( src );
messageBar()->pushMessage( tr( "Invalid Data Source" ), msg, QgsMessageBar::CRITICAL, messageTimeout() );

// since the layer is bad, stomp on it
Expand Down Expand Up @@ -7581,7 +7581,7 @@ void QgisApp::mergeAttributesOfSelectedFeatures()
{
messageBar()->pushMessage(
tr( "Not enough features selected" ),
tr( "The merge tool requires at least two selected features" ),
tr( "The merge tool requires at least two selected features." ),
QgsMessageBar::WARNING );
return;
}
Expand Down Expand Up @@ -7736,7 +7736,7 @@ void QgisApp::mergeSelectedFeatures()
{
messageBar()->pushMessage(
tr( "Merge failed" ),
tr( "An error occurred during the merge operation" ),
tr( "An error occurred during the merge operation." ),
QgsMessageBar::CRITICAL );
}
return;
Expand Down Expand Up @@ -7772,7 +7772,7 @@ void QgisApp::mergeSelectedFeatures()
{
messageBar()->pushMessage(
tr( "Merge failed" ),
tr( "An error occurred during the merge operation" ),
tr( "An error occurred during the merge operation." ),
QgsMessageBar::CRITICAL );
}
return;
Expand All @@ -7798,7 +7798,7 @@ void QgisApp::mergeSelectedFeatures()
{
messageBar()->pushMessage(
tr( "Invalid result" ),
tr( "Could not store value '%1' in field of type %2" ).arg( attrs.at( i ).toString(), vl->fields().at( i ).typeName() ),
tr( "Could not store value '%1' in field of type %2." ).arg( attrs.at( i ).toString(), vl->fields().at( i ).typeName() ),
QgsMessageBar::WARNING );
}
attrs[i] = val;
Expand Down Expand Up @@ -7928,7 +7928,7 @@ void QgisApp::selectAll()
{
messageBar()->pushMessage(
tr( "No active vector layer" ),
tr( "To select all, choose a vector layer in the legend" ),
tr( "To select all, choose a vector layer in the legend." ),
QgsMessageBar::INFO,
messageTimeout() );
return;
Expand All @@ -7952,7 +7952,7 @@ void QgisApp::selectByExpression()
{
messageBar()->pushMessage(
tr( "No active vector layer" ),
tr( "To select features, choose a vector layer in the legend" ),
tr( "To select features, choose a vector layer in the legend." ),
QgsMessageBar::INFO,
messageTimeout() );
return;
Expand All @@ -7972,7 +7972,7 @@ void QgisApp::selectByForm()
{
messageBar()->pushMessage(
tr( "No active vector layer" ),
tr( "To select features, choose a vector layer in the legend" ),
tr( "To select features, choose a vector layer in the legend." ),
QgsMessageBar::INFO,
messageTimeout() );
return;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmapthemes.cpp
View file
Expand Up @@ -110,7 +110,7 @@ void QgsMapThemes::addPreset()
dlg.setWindowTitle( tr( "Map Themes" ) );
dlg.setHintString( tr( "Name of the new theme" ) );
dlg.setOverwriteEnabled( false );
dlg.setConflictingNameWarning( tr( "A theme with this name already exists" ) );
dlg.setConflictingNameWarning( tr( "A theme with this name already exists." ) );
if ( dlg.exec() != QDialog::Accepted || dlg.name().isEmpty() )
return;

Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsmaptooladdring.cpp
View file
Expand Up @@ -65,7 +65,7 @@ void QgsMapToolAddRing::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
else if ( error == 2 )
{
//problem with coordinate transformation
emit messageEmitted( tr( "Cannot transform the point to the layers coordinate system" ), QgsMessageBar::WARNING );
emit messageEmitted( tr( "Cannot transform the point to the layers coordinate system." ), QgsMessageBar::WARNING );
return;
}

Expand Down Expand Up @@ -126,7 +126,7 @@ void QgsMapToolAddRing::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
{
errorMessage = tr( "an unknown error occurred" );
}
emit messageEmitted( tr( "could not add ring since %1." ).arg( errorMessage ), QgsMessageBar::CRITICAL );
emit messageEmitted( tr( "Could not add ring since %1." ).arg( errorMessage ), QgsMessageBar::CRITICAL );
vlayer->destroyEditCommand();
}
else
Expand Down
2 changes: 1 addition & 1 deletion src/core/geocms/geonode/qgsgeonoderequest.cpp
View file
Expand Up @@ -235,7 +235,7 @@ void QgsGeoNodeRequest::replyFinished()

if ( mHttpGeoNodeResponse.isEmpty() )
{
mError = tr( "empty of capabilities: %1" ).arg( mGeoNodeReply->errorString() );
mError = tr( "Empty of capabilities: %1" ).arg( mGeoNodeReply->errorString() );
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/core/qgsvectorfilewriter.cpp
View file
Expand Up @@ -530,7 +530,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,

default:
//assert(0 && "invalid variant type!");
mErrorMessage = QObject::tr( "unsupported type for field %1" )
mErrorMessage = QObject::tr( "Unsupported type for field %1" )
.arg( attrField.name() );
mError = ErrAttributeTypeUnsupported;
return;
Expand All @@ -553,7 +553,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,

if ( i == 10 )
{
mErrorMessage = QObject::tr( "no available replacement for internal fieldname ogc_fid found" ).arg( attrField.name() );
mErrorMessage = QObject::tr( "No available replacement for internal fieldname ogc_fid found" ).arg( attrField.name() );
mError = ErrAttributeCreationFailed;
return;
}
Expand Down Expand Up @@ -581,7 +581,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
if ( OGR_L_CreateField( mLayer, fld.get(), true ) != OGRERR_NONE )
{
QgsDebugMsg( "error creating field " + attrField.name() );
mErrorMessage = QObject::tr( "creation of field %1 failed (OGR error: %2)" )
mErrorMessage = QObject::tr( "Creation of field %1 failed (OGR error: %2)" )
.arg( attrField.name(),
QString::fromUtf8( CPLGetLastErrorMsg() ) );
mError = ErrAttributeCreationFailed;
Expand All @@ -598,7 +598,7 @@ void QgsVectorFileWriter::init( QString vectorFileName,
if ( ogrIdx < 0 )
{
QgsDebugMsg( "error creating field " + attrField.name() );
mErrorMessage = QObject::tr( "created field %1 not found (OGR error: %2)" )
mErrorMessage = QObject::tr( "Created field %1 not found (OGR error: %2)" )
.arg( attrField.name(),
QString::fromUtf8( CPLGetLastErrorMsg() ) );
mError = ErrAttributeCreationFailed;
Expand Down Expand Up @@ -837,7 +837,7 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
// as we set encoding for shapefiles based on "fileEncoding" parameter passed to the writer
#if 0
layerOptions.insert( "ENCODING", new SetOption(
QObject::tr( "set the encoding value in the DBF file. "
QObject::tr( "Set the encoding value in the DBF file. "
"The default value is LDID/87. It is not clear "
"what other values may be appropriate." ),
QStringList()
Expand Down Expand Up @@ -1068,7 +1068,7 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()
) );

datasetOptions.insert( QStringLiteral( "GML3_LONGSRS" ), new BoolOption(
QObject::tr( "Only valid when FORMAT=GML3/GML3Degree/GML3.2. Default to YES. "
QObject::tr( "Only valid when FORMAT=GML3/GML3Degree/GML3.2. Default to YES. " //needs review here
"If YES, SRS with EPSG authority will be written with the "
"'urn:ogc:def:crs:EPSG::' prefix. In the case the SRS is a "
"geographic SRS without explicit AXIS order, but that the same "
Expand Down Expand Up @@ -1440,7 +1440,7 @@ QMap<QString, QgsVectorFileWriter::MetaData> QgsVectorFileWriter::initMetaData()

datasetOptions.insert( QStringLiteral( "ADD_SOUNDG_DEPTH" ), new BoolOption(
QObject::tr( "Should a DEPTH attribute be added on SOUNDG features and assign the depth "
"of the sounding. This should only be enabled with SPLIT_MULTIPOINT is "
"of the sounding. This should only be enabled when SPLIT_MULTIPOINT is "
"also enabled." ),
false // Default value
) );
Expand Down
14 changes: 7 additions & 7 deletions src/gui/auth/qgsauthauthoritieseditor.cpp
View file
Expand Up @@ -641,7 +641,7 @@ void QgsAuthAuthoritiesEditor::defaultTrustPolicyChanged( QgsAuthCertUtils::Cert
{
if ( !QgsApplication::authManager()->setDefaultCertTrustPolicy( trustpolicy ) )
{
authMessageOut( QObject::tr( "Could not store default trust policy" ),
authMessageOut( QObject::tr( "Could not store default trust policy." ),
QObject::tr( "Authorities Manager" ),
QgsAuthManager::CRITICAL );
}
Expand Down Expand Up @@ -671,14 +671,14 @@ void QgsAuthAuthoritiesEditor::btnCaFile_clicked()

if ( !QgsApplication::authManager()->storeAuthSetting( QStringLiteral( "cafile" ), QVariant( fn ) ) )
{
authMessageOut( QObject::tr( "Could not store 'CA file path' in authentication database" ),
authMessageOut( QObject::tr( "Could not store 'CA file path' in authentication database." ),
QObject::tr( "Authorities Manager" ),
QgsAuthManager::WARNING );
}
if ( !QgsApplication::authManager()->storeAuthSetting( QStringLiteral( "cafileallowinvalid" ),
QVariant( dlg->allowInvalidCerts() ) ) )
{
authMessageOut( QObject::tr( "Could not store 'CA file allow invalids' setting in authentication database" ),
authMessageOut( QObject::tr( "Could not store 'CA file allow invalids' setting in authentication database." ),
QObject::tr( "Authorities Manager" ),
QgsAuthManager::WARNING );
}
Expand All @@ -692,7 +692,7 @@ void QgsAuthAuthoritiesEditor::btnCaFile_clicked()
{
if ( !QgsApplication::authManager()->storeCertTrustPolicy( cert, dlg->certTrustPolicy() ) )
{
authMessageOut( QObject::tr( "Could not set trust policy for imported certificates" ),
authMessageOut( QObject::tr( "Could not set trust policy for imported certificates." ),
QObject::tr( "Authorities Manager" ),
QgsAuthManager::WARNING );
}
Expand All @@ -713,14 +713,14 @@ void QgsAuthAuthoritiesEditor::btnCaFileClear_clicked()
{
if ( !QgsApplication::authManager()->removeAuthSetting( QStringLiteral( "cafile" ) ) )
{
authMessageOut( QObject::tr( "Could not remove 'CA file path' from authentication database" ),
authMessageOut( QObject::tr( "Could not remove 'CA file path' from authentication database." ),
QObject::tr( "Authorities Manager" ),
QgsAuthManager::WARNING );
return;
}
if ( !QgsApplication::authManager()->removeAuthSetting( QStringLiteral( "cafileallowinvalid" ) ) )
{
authMessageOut( QObject::tr( "Could not remove 'CA file allow invalids' setting from authentication database" ),
authMessageOut( QObject::tr( "Could not remove 'CA file allow invalids' setting from authentication database." ),
QObject::tr( "Authorities Manager" ),
QgsAuthManager::WARNING );
return;
Expand All @@ -737,7 +737,7 @@ void QgsAuthAuthoritiesEditor::btnCaFileClear_clicked()
{
if ( !QgsApplication::authManager()->removeCertTrustPolicies( certs ) )
{
messageBar()->pushMessage( tr( "ERROR removing cert(s) trust policy from authentication database" ),
messageBar()->pushMessage( tr( "ERROR removing cert(s) trust policy from authentication database." ),
QgsMessageBar::CRITICAL );
return;
}
Expand Down
20 changes: 10 additions & 10 deletions src/gui/auth/qgsauthguiutils.cpp
View file
Expand Up @@ -83,7 +83,7 @@ void QgsAuthGuiUtils::setMasterPassword( QgsMessageBar *msgbar, int timeout )
if ( QgsApplication::authManager()->masterPasswordIsSet() )
{
msgbar->pushMessage( QgsApplication::authManager()->authManTag(),
QObject::tr( "Master password already set" ),
QObject::tr( "Master password already set." ),
QgsMessageBar::INFO, timeout );
return;
}
Expand All @@ -95,16 +95,16 @@ void QgsAuthGuiUtils::clearCachedMasterPassword( QgsMessageBar *msgbar, int time
if ( QgsAuthGuiUtils::isDisabled( msgbar, timeout ) )
return;

QString msg( QObject::tr( "Master password not cleared because it is not set" ) );
QString msg( QObject::tr( "Master password not cleared because it is not set." ) );
QgsMessageBar::MessageLevel level( QgsMessageBar::INFO );

if ( QgsApplication::authManager()->masterPasswordIsSet() )
{
QgsApplication::authManager()->clearMasterPassword();
msg = QObject::tr( "Master password cleared (NOTE: network connections may be cached)" );
msg = QObject::tr( "Master password cleared (NOTE: network connections may be cached)." );
if ( QgsApplication::authManager()->masterPasswordIsSet() )
{
msg = QObject::tr( "Master password FAILED to be cleared" );
msg = QObject::tr( "Master password FAILED to be cleared." );
level = QgsMessageBar::WARNING;
}
}
Expand Down Expand Up @@ -181,12 +181,12 @@ void QgsAuthGuiUtils::removeAuthenticationConfigs( QgsMessageBar *msgbar, int ti
return;
}

QString msg( QObject::tr( "Authentication configurations removed" ) );
QString msg( QObject::tr( "Authentication configurations removed." ) );
QgsMessageBar::MessageLevel level( QgsMessageBar::INFO );

if ( !QgsApplication::authManager()->removeAllAuthenticationConfigs() )
{
msg = QObject::tr( "Authentication configurations FAILED to be removed" );
msg = QObject::tr( "Authentication configurations FAILED to be removed." );
level = QgsMessageBar::WARNING;
}

Expand Down Expand Up @@ -214,13 +214,13 @@ void QgsAuthGuiUtils::eraseAuthenticationDatabase( QgsMessageBar *msgbar, int ti
return;
}

QString msg( QObject::tr( "Active authentication database erased" ) );
QString msg( QObject::tr( "Active authentication database erased." ) );
QgsMessageBar::MessageLevel level( QgsMessageBar::WARNING );

QString backuppath;
if ( !QgsApplication::authManager()->eraseAuthenticationDatabase( true, &backuppath ) )
{
msg = QObject::tr( "Authentication database FAILED to be erased" );
msg = QObject::tr( "Authentication database FAILED to be erased." );
level = QgsMessageBar::WARNING;
}
else
Expand Down Expand Up @@ -296,7 +296,7 @@ void QgsAuthGuiUtils::passwordHelperSync( QgsMessageBar *msgbar, int timeout )
QgsMessageBar::MessageLevel level;
if ( ! QgsApplication::authManager()->masterPasswordIsSet() )
{
msg = QObject::tr( "Master password is not set and cannot be stored in your %1" )
msg = QObject::tr( "Master password is not set and cannot be stored in your %1." )
.arg( QgsAuthManager::AUTH_PASSWORD_HELPER_DISPLAY_NAME );
level = QgsMessageBar::WARNING;
}
Expand All @@ -307,7 +307,7 @@ void QgsAuthGuiUtils::passwordHelperSync( QgsMessageBar *msgbar, int timeout )
}
else
{
msg = QObject::tr( "Master password has been successfully stored in your %1" )
msg = QObject::tr( "Master password has been successfully stored in your %1." )
.arg( QgsAuthManager::AUTH_PASSWORD_HELPER_DISPLAY_NAME );

level = QgsMessageBar::INFO;
Expand Down
6 changes: 3 additions & 3 deletions src/gui/auth/qgsauthidentitieseditor.cpp
View file
Expand Up @@ -302,7 +302,7 @@ void QgsAuthIdentitiesEditor::btnAddIdentity_clicked()
const QPair<QSslCertificate, QSslKey> &bundle( dlg->certBundleToImport() );
if ( !QgsApplication::authManager()->storeCertIdentity( bundle.first, bundle.second ) )
{
messageBar()->pushMessage( tr( "ERROR storing identity bundle in authentication database" ),
messageBar()->pushMessage( tr( "ERROR storing identity bundle in authentication database." ),
QgsMessageBar::CRITICAL );
}
populateIdentitiesView();
Expand All @@ -326,7 +326,7 @@ void QgsAuthIdentitiesEditor::btnRemoveIdentity_clicked()

if ( digest.isEmpty() )
{
messageBar()->pushMessage( tr( "Certificate id missing" ),
messageBar()->pushMessage( tr( "Certificate id missing." ),
QgsMessageBar::WARNING );
return;
}
Expand Down Expand Up @@ -372,7 +372,7 @@ void QgsAuthIdentitiesEditor::btnGroupByOrg_toggled( bool checked )
{
if ( !QgsApplication::authManager()->storeAuthSetting( QStringLiteral( "identitiessortby" ), QVariant( checked ) ) )
{
authMessageOut( QObject::tr( "Could not store sort by preference" ),
authMessageOut( QObject::tr( "Could not store sort by preference." ),
QObject::tr( "Authentication Identities" ),
QgsAuthManager::WARNING );
}
Expand Down
6 changes: 3 additions & 3 deletions src/gui/auth/qgsauthserverseditor.cpp
View file
Expand Up @@ -352,13 +352,13 @@ void QgsAuthServersEditor::btnEditServer_clicked()

if ( digest.isEmpty() )
{
messageBar()->pushMessage( tr( "SSL custom config id missing" ),
messageBar()->pushMessage( tr( "SSL custom config id missing." ),
QgsMessageBar::WARNING );
return;
}
if ( hostport.isEmpty() )
{
messageBar()->pushMessage( tr( "SSL custom config host:port missing" ),
messageBar()->pushMessage( tr( "SSL custom config host:port missing." ),
QgsMessageBar::WARNING );
return;
}
Expand Down Expand Up @@ -387,7 +387,7 @@ void QgsAuthServersEditor::btnGroupByOrg_toggled( bool checked )
{
if ( !QgsApplication::authManager()->storeAuthSetting( QStringLiteral( "serverssortby" ), QVariant( checked ) ) )
{
authMessageOut( QObject::tr( "Could not store sort by preference" ),
authMessageOut( QObject::tr( "Could not store sort by preference." ),
QObject::tr( "Authentication SSL Configs" ),
QgsAuthManager::WARNING );
}
Expand Down

0 comments on commit c2577ec

Please sign in to comment.