Skip to content
Permalink
Browse files
fix #2815 - including more missing translation strings
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13744 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Jun 17, 2010
1 parent 6a9bc7a commit e4b856da1c1c340a6313e945d4b9d8cca2c6460d
@@ -774,9 +774,10 @@ class QgsSymbolLayerV2AbstractMetadata

public:
/** construct metadata */
QgsSymbolLayerV2AbstractMetadata( QString name, QgsSymbolV2::SymbolType type );
QgsSymbolLayerV2AbstractMetadata( QString name, QString visibleName, QgsSymbolV2::SymbolType type );

QString name() const;
QString visibleName() const;
QgsSymbolV2::SymbolType type() const;

/** create a symbol layer of this type given the map of properties. */
@@ -3760,7 +3760,7 @@ void QgisApp::labeling()
QgsMapLayer* layer = activeLayer();
if ( layer == NULL || layer->type() != QgsMapLayer::VectorLayer )
{
QMessageBox::warning( this, "Labeling", "Please select a vector layer first." );
QMessageBox::warning( this, tr( "Labeling" ), tr( "Please select a vector layer first." ) );
return;
}
QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>( layer );
@@ -4190,7 +4190,7 @@ void QgisApp::mergeSelectedFeatures()
const QgsFeatureIds& featureIdSet = vl->selectedFeaturesIds();
if ( featureIdSet.size() < 2 )
{
QMessageBox::information( 0, "Not enough features selected", tr( "The merge tool requires at least two selected features" ) );
QMessageBox::information( 0, tr( "Not enough features selected" ), tr( "The merge tool requires at least two selected features" ) );
return;
}

@@ -4212,7 +4212,7 @@ void QgisApp::mergeSelectedFeatures()
QGis::WkbType newType = unionGeom->wkbType();
if ( providerChecksTypeStrictly && unionGeom->wkbType() != vl->wkbType() )
{
QMessageBox::critical( 0, "Union operation canceled", tr( "The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled" ) );
QMessageBox::critical( 0, tr( "Union operation canceled" ), tr( "The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled" ) );
delete unionGeom;
return;
}
@@ -4229,7 +4229,7 @@ void QgisApp::mergeSelectedFeatures()

if ( featureListAfter.size() < 2 )
{
QMessageBox::information( 0, "Not enough features selected", tr( "The merge tool requires at least two selected features" ) );
QMessageBox::information( 0, tr( "Not enough features selected" ), tr( "The merge tool requires at least two selected features" ) );
delete unionGeom;
return;
}
@@ -344,7 +344,7 @@ void QgsCustomProjectionDialog::on_pbnFirst_clicked()
//cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId));
leParameters->setText( QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 4 ) ) );
mCurrentRecordLong = 1;
lblRecordNo->setText( QString::number( mCurrentRecordLong ) + " of " + QString::number( mRecordCountLong ) );
lblRecordNo->setText( tr( "%1 of %2" ).arg( mCurrentRecordLong ).arg( mRecordCountLong ) );
}
}
else
@@ -416,7 +416,7 @@ void QgsCustomProjectionDialog::on_pbnPrevious_clicked()
//cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId));
leParameters->setText( QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 4 ) ) ),
--mCurrentRecordLong;
lblRecordNo->setText( QString::number( mCurrentRecordLong ) + " of " + QString::number( mRecordCountLong ) );
lblRecordNo->setText( tr( "%1 of %2" ).arg( mCurrentRecordLong ).arg( mRecordCountLong ) );
}
}
else
@@ -489,7 +489,7 @@ void QgsCustomProjectionDialog::on_pbnNext_clicked()
//cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId));
leParameters->setText( QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 4 ) ) );
++mCurrentRecordLong;
lblRecordNo->setText( QString::number( mCurrentRecordLong ) + " of " + QString::number( mRecordCountLong ) );
lblRecordNo->setText( tr( "%1 of %2" ).arg( mCurrentRecordLong ).arg( mRecordCountLong ) );
}
}
else
@@ -558,7 +558,7 @@ void QgsCustomProjectionDialog::on_pbnLast_clicked()
//cboEllipsoid->setCurrentText(getEllipsoidName(myEllipsoidId));
leParameters->setText( QString::fromUtf8(( char * )sqlite3_column_text( myPreparedStatement, 4 ) ) );
mCurrentRecordLong = mRecordCountLong;
lblRecordNo->setText( QString::number( mCurrentRecordLong ) + " of " + QString::number( mRecordCountLong ) );
lblRecordNo->setText( tr( "%1 of %2" ).arg( mCurrentRecordLong ).arg( mRecordCountLong ) );
}
}
else
@@ -620,7 +620,7 @@ void QgsCustomProjectionDialog::on_pbnNew_clicked()
leParameters->setText( "" );
//cboProjectionFamily->setCurrentItem(0);
//cboEllipsoid->setCurrentItem(0);
lblRecordNo->setText( "* of " + QString::number( mRecordCountLong ) );
lblRecordNo->setText( tr( "* of %1" ).arg( mRecordCountLong ) );
//remember the rec we are on in case the user aborts
mLastRecordLong = mCurrentRecordLong;
mCurrentRecordId = "";
@@ -898,8 +898,8 @@ void QgsCustomProjectionDialog::on_pbnCalculate_clicked()
int projResult = pj_transform( wgs84Proj, myProj, 1, 0, &easthing, &northing, &z );
if ( projResult != 0 )
{
projectedX->setText( "Error" );
projectedY->setText( "Error" );
projectedX->setText( tr( "Error" ) );
projectedY->setText( tr( "Error" ) );
QgsDebugMsg( pj_strerrno( projResult ) );
}
else
@@ -145,9 +145,9 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QWidget *p
//cboxClassificationMode->addItem( tr( "Quantiles" ) );

QStringList headerLabels;
headerLabels << "Value";
headerLabels << "Color";
headerLabels << "Label";
headerLabels << tr( "Value" );
headerLabels << tr( "Color" );
headerLabels << tr( "Label" );
mColormapTreeWidget->setHeaderLabels( headerLabels );

//disable colormap tab completely until 'Colormap' is selected (and only for type GrayOrUndefined)
@@ -256,9 +256,10 @@ void QgsSingleSymbolDialog::selectFillColor()
//should this method have a different name?
void QgsSingleSymbolDialog::selectTextureImage()
{
QString fileName = QFileDialog::getOpenFileName( this, "Open File",
QString fileName = QFileDialog::getOpenFileName( this,
tr( "Open File" ),
mTexturePath,
"Images (*.png *.xpm *.jpg)" ); //should we allow other types of images?
tr( "Images (*.png *.xpm *.jpg)" ) ); //should we allow other types of images?

if ( !fileName.isNull() )
{ //only process the string if the user clicked OK
@@ -238,6 +238,7 @@ SET(QGIS_CORE_MOC_HDRS
qgsvectorlayer.h
qgsrasterdataprovider.h
qgsnetworkaccessmanager.h
qgsvectordataprovider.h

composer/qgscomposerlegend.h
composer/qgscomposermap.h
@@ -91,7 +91,7 @@ bool QgsApplication::notify( QObject * receiver, QEvent * event )
}
catch ( ... )
{
QMessageBox::critical( activeWindow(), tr( "Exception" ), "unknown exception" );
QMessageBox::critical( activeWindow(), tr( "Exception" ), tr( "unknown exception" ) );
}
return done;
}
@@ -582,7 +582,7 @@ QString QgsMapLayer::loadNamedStyle( const QString theURI, bool &theResultFlag )
QDomElement myRoot = myDocument.firstChildElement( "qgis" );
if ( myRoot.isNull() )
{
myErrorMessage = "Error: qgis element could not be found in " + theURI;
myErrorMessage = tr( "Error: qgis element could not be found in %1" ).arg( theURI );
theResultFlag = false;
return myErrorMessage;
}
@@ -289,7 +289,7 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib
// this error should be caught when checking syntax, but for sure...
if ( mType != tOperator )
{
mError = "Expected operator, got scalar value!";
mError = QObject::tr( "Expected operator, got scalar value!" );
return false;
}

@@ -352,7 +352,7 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib
case opGE: return ( res >= 0 );
case opLE: return ( res <= 0 );
default:
mError = "Unexpected state when evaluating operator!";
mError = QObject::tr( "Unexpected state when evaluating operator!" );
return false;
}

@@ -392,8 +392,7 @@ bool QgsSearchTreeNode::checkAgainst( const QgsFieldMap& fields, const QgsAttrib
}

default:
mError = "Unknown operator: ";
mError += QString::number( mOp );
mError = QObject::tr( "Unknown operator: %1" ).arg( mOp );
return false;
}
}
@@ -414,15 +413,13 @@ bool QgsSearchTreeNode::getValue( QgsSearchTreeValue& value, QgsSearchTreeNode*

// these should never happen (no need to translate)
case 3:
mError = "Unknown operator: ";
mError += value.string();
mError = QObject::tr( "Unknown operator: %1" ).arg( value.string() );
break;
case 4:
mError = "Unknown token: ";
mError += value.string();
mError = QObject::tr( "Unknown token: %1" ).arg( value.string() );
break;
default:
mError = "Unknown error!";
mError = QObject::tr( "Unknown error!" );
break;
}
return false;
@@ -163,50 +163,50 @@ QString QgsVectorDataProvider::capabilitiesString() const

if ( abilities & QgsVectorDataProvider::AddFeatures )
{
abilitiesList += "Add Features";
abilitiesList += tr( "Add Features" );
QgsDebugMsg( "Capability: Add Features" );
}

if ( abilities & QgsVectorDataProvider::DeleteFeatures )
{
abilitiesList += "Delete Features";
abilitiesList += tr( "Delete Features" );
QgsDebugMsg( "Capability: Delete Features" );
}

if ( abilities & QgsVectorDataProvider::ChangeAttributeValues )
{
abilitiesList += "Change Attribute Values";
abilitiesList += tr( "Change Attribute Values" );
QgsDebugMsg( "Capability: Change Attribute Values" );
}

if ( abilities & QgsVectorDataProvider::AddAttributes )
{
abilitiesList += "Add Attributes";
abilitiesList += tr( "Add Attributes" );
QgsDebugMsg( "Capability: Add Attributes" );
}

if ( abilities & QgsVectorDataProvider::DeleteAttributes )
{
abilitiesList += "Delete Attributes";
abilitiesList += tr( "Delete Attributes" );
QgsDebugMsg( "Capability: Delete Attributes" );
}

if ( abilities & QgsVectorDataProvider::CreateSpatialIndex )
{
// TODO: Tighten up this test. See QgsOgrProvider for details.
abilitiesList += "Create Spatial Index";
abilitiesList += tr( "Create Spatial Index" );
QgsDebugMsg( "Capability: Create Spatial Index" );
}

if ( abilities & QgsVectorDataProvider::SelectAtId )
{
abilitiesList += "Fast Access to Features at ID";
abilitiesList += tr( "Fast Access to Features at ID" );
QgsDebugMsg( "Capability: Select at ID" );
}

if ( abilities & QgsVectorDataProvider::ChangeGeometries )
{
abilitiesList += "Change Geometries";
abilitiesList += tr( "Change Geometries" );
QgsDebugMsg( "Capability: Change Geometries" );
}

@@ -38,6 +38,8 @@ class QTextCodec;
*/
class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider
{
Q_OBJECT

public:

// If you add to this, please also add to capabilitiesString()
@@ -2844,14 +2844,14 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString&
{
if ( !myRenderer->writeXML( node, doc, *this ) )
{
errorMessage = "renderer failed to save";
errorMessage = tr( "renderer failed to save" );
return false;
}
}
else
{
QgsDebugMsg( "no renderer" );
errorMessage = "no renderer";
errorMessage = tr( "no renderer" );
return false;
}
}
@@ -10,23 +10,23 @@ QgsSymbolLayerV2Registry* QgsSymbolLayerV2Registry::mInstance = NULL;
QgsSymbolLayerV2Registry::QgsSymbolLayerV2Registry()
{
// init registry with known symbol layers
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleLine", QgsSymbolV2::Line,
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleLine", QObject::tr( "Simple line" ), QgsSymbolV2::Line,
QgsSimpleLineSymbolLayerV2::create ) );
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "MarkerLine", QgsSymbolV2::Line,
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "MarkerLine", QObject::tr( "Marker line" ), QgsSymbolV2::Line,
QgsMarkerLineSymbolLayerV2::create ) );
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "LineDecoration", QgsSymbolV2::Line,
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "LineDecoration", QObject::tr( "Line decoration" ), QgsSymbolV2::Line,
QgsLineDecorationSymbolLayerV2::create ) );

addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleMarker", QgsSymbolV2::Marker,
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleMarker", QObject::tr( "Simple marker" ), QgsSymbolV2::Marker,
QgsSimpleMarkerSymbolLayerV2::create ) );
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SvgMarker", QgsSymbolV2::Marker,
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SvgMarker", QObject::tr( "SVG marker" ), QgsSymbolV2::Marker,
QgsSvgMarkerSymbolLayerV2::create ) );
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "FontMarker", QgsSymbolV2::Marker,
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "FontMarker", QObject::tr( "Font marker" ), QgsSymbolV2::Marker,
QgsFontMarkerSymbolLayerV2::create ) );

addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleFill", QgsSymbolV2::Fill,
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SimpleFill", QObject::tr( "Simple fill" ), QgsSymbolV2::Fill,
QgsSimpleFillSymbolLayerV2::create ) );
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SVGFill", QgsSymbolV2::Fill, QgsSVGFillSymbolLayer::create ) );
addSymbolLayerType( new QgsSymbolLayerV2Metadata( "SVGFill", QObject::tr( "SVG fill" ), QgsSymbolV2::Fill, QgsSVGFillSymbolLayer::create ) );
}

QgsSymbolLayerV2Registry::~QgsSymbolLayerV2Registry()
@@ -14,10 +14,11 @@
class CORE_EXPORT QgsSymbolLayerV2AbstractMetadata
{
public:
QgsSymbolLayerV2AbstractMetadata( QString name, QgsSymbolV2::SymbolType type )
: mName( name ), mType( type ) {}
QgsSymbolLayerV2AbstractMetadata( QString name, QString visibleName, QgsSymbolV2::SymbolType type )
: mName( name ), mVisibleName( visibleName ), mType( type ) {}

QString name() const { return mName; }
QString visibleName() const { return mVisibleName; }
QgsSymbolV2::SymbolType type() const { return mType; }

/** create a symbol layer of this type given the map of properties. */
@@ -27,6 +28,7 @@ class CORE_EXPORT QgsSymbolLayerV2AbstractMetadata

protected:
QString mName;
QString mVisibleName;
QgsSymbolV2::SymbolType mType;
};

@@ -39,10 +41,11 @@ typedef QgsSymbolLayerV2Widget*( *QgsSymbolLayerV2WidgetFunc )();
class CORE_EXPORT QgsSymbolLayerV2Metadata : public QgsSymbolLayerV2AbstractMetadata
{
public:
QgsSymbolLayerV2Metadata( QString name, QgsSymbolV2::SymbolType type,
QgsSymbolLayerV2Metadata( QString name, QString visibleName,
QgsSymbolV2::SymbolType type,
QgsSymbolLayerV2CreateFunc pfCreate,
QgsSymbolLayerV2WidgetFunc pfWidget = NULL )
: QgsSymbolLayerV2AbstractMetadata( name, type ), mCreateFunc( pfCreate ), mWidgetFunc( pfWidget ) {}
: QgsSymbolLayerV2AbstractMetadata( name, visibleName, type ), mCreateFunc( pfCreate ), mWidgetFunc( pfWidget ) {}

QgsSymbolLayerV2CreateFunc createFunction() const { return mCreateFunc; }
QgsSymbolLayerV2WidgetFunc widgetFunction() const { return mWidgetFunc; }
@@ -74,6 +74,7 @@ symbology-ng/qgsvectorrandomcolorrampv2dialog.h
symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.h
symbology-ng/characterwidget.h
symbology-ng/qgspenstylecombobox.h
symbology-ng/qgsbrushstylecombobox.h

qgsattributeeditor.h
qgscomposerview.h
@@ -127,7 +127,7 @@ void QgsComposerView::mousePressEvent( QMouseEvent* e )
case AddLabel:
{
QgsComposerLabel* newLabelItem = new QgsComposerLabel( composition() );
newLabelItem->setText( "Quantum GIS" );
newLabelItem->setText( tr( "Quantum GIS" ) );
newLabelItem->adjustSizeToText();
newLabelItem->setSceneRect( QRectF( snappedScenePoint.x(), snappedScenePoint.y(), newLabelItem->rect().width(), newLabelItem->rect().height() ) );
addComposerLabel( newLabelItem );
@@ -90,7 +90,7 @@ void QgsEncodingFileDialog::addCancelAll()
{
if ( ! mCancelAllButton )
{
mCancelAllButton = new QPushButton( "Cancel &All", NULL );
mCancelAllButton = new QPushButton( tr( "Cancel &All" ), NULL );
layout()->addWidget( mCancelAllButton ); // Ownership transfered, no need to delete later on
connect( mCancelAllButton, SIGNAL( clicked() ), this, SLOT( pbnCancelAll_clicked() ) );
}

0 comments on commit e4b856d

Please sign in to comment.