Skip to content

Commit

Permalink
more translation string fixes and updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Feb 17, 2018
1 parent 030714c commit c3573b1
Show file tree
Hide file tree
Showing 73 changed files with 180 additions and 180 deletions.
34 changes: 17 additions & 17 deletions resources/customization.xml
View file
Expand Up @@ -54,7 +54,7 @@
<widget objectName="editLabel" class="QLineEdit" label=""/>
<widget objectName="label_5" class="QLabel" label="Filter"/>
<widget objectName="editFilter" class="QLineEdit" label=""/>
<widget objectName="btnExpressionBuilder" class="QPushButton" label="..."/>
<widget objectName="btnExpressionBuilder" class="QPushButton" label="…"/>
<widget objectName="btnTestFilter" class="QPushButton" label="Test"/>
<widget objectName="label_4" class="QLabel" label="Description"/>
<widget objectName="editDescription" class="QLineEdit" label=""/>
Expand Down Expand Up @@ -385,7 +385,7 @@
<widget objectName="label_3" class="QLabel" label="Column"/>
<widget objectName="cboCategorizedColumn" class="QComboBox" label=""/>
<widget objectName="label_9" class="QLabel" label="Symbol"/>
<widget objectName="btnChangeCategorizedSymbol" class="QPushButton" label="Change..."/>
<widget objectName="btnChangeCategorizedSymbol" class="QPushButton" label="Change…"/>
<widget objectName="label_10" class="QLabel" label="Color ramp"/>
<widget objectName="btnAddCategories" class="QPushButton" label="Classify"/>
<widget objectName="btnAddCategory" class="QPushButton" label="Add"/>
Expand Down Expand Up @@ -445,7 +445,7 @@
</widget>
<widget objectName="mLogFileGroupBox" class="QGroupBox" label="">
<widget objectName="mTxtLogFile" class="QLineEdit" label=""/>
<widget objectName="mBtnLogFile" class="QPushButton" label="..."/>
<widget objectName="mBtnLogFile" class="QPushButton" label="…"/>
</widget>
<widget objectName="groupBox" class="QGroupBox" label="">
<widget objectName="radRecenterWhenNeeded" class="QRadioButton" label="when leaving"/>
Expand Down Expand Up @@ -629,7 +629,7 @@
<widget objectName="mResultGroupBox" class="QGroupBox" label="">
<widget objectName="mOutputLayerLabel" class="QLabel" label="Output layer"/>
<widget objectName="mOutputLayerLineEdit" class="QLineEdit" label=""/>
<widget objectName="mOutputLayerPushButton" class="QPushButton" label="..."/>
<widget objectName="mOutputLayerPushButton" class="QPushButton" label="…"/>
<widget objectName="mCurrentLayerExtentButton" class="QPushButton" label="Current layer extent"/>
<widget objectName="mXMinLabel" class="QLabel" label="X min"/>
<widget objectName="mXMaxLabel" class="QLabel" label="XMax"/>
Expand Down Expand Up @@ -770,7 +770,7 @@
<widget objectName="label" class="QLabel" label="Layer name"/>
<widget objectName="leLayerName" class="QLineEdit" label=""/>
<widget objectName="labelCoordRefSys" class="QLabel" label="Coordinate Reference System"/>
<widget objectName="btnChangeSpatialRefSys" class="QPushButton" label="Change ..."/>
<widget objectName="btnChangeSpatialRefSys" class="QPushButton" label="Change…"/>
<widget objectName="mTileWidth" class="QLineEdit" label=""/>
<widget objectName="label_2" class="QLabel" label="Tile size"/>
<widget objectName="mTileHeight" class="QLineEdit" label=""/>
Expand Down Expand Up @@ -853,8 +853,8 @@
<widget objectName="btnChangeShortcut" class="QPushButton" label="Change"/>
<widget objectName="btnSetNoShortcut" class="QPushButton" label="Set none"/>
<widget objectName="btnResetShortcut" class="QPushButton" label="Set default"/>
<widget objectName="btnLoadShortcuts" class="QPushButton" label="Load..."/>
<widget objectName="btnSaveShortcuts" class="QPushButton" label="Save..."/>
<widget objectName="btnLoadShortcuts" class="QPushButton" label="Load…"/>
<widget objectName="btnSaveShortcuts" class="QPushButton" label="Save…"/>
<widget objectName="buttonBox" class="QDialogButtonBox" label=""/>
</widget>
<widget objectName="QgsNewSpatialiteLayerDialogBase" class="QDialog" label="">
Expand Down Expand Up @@ -938,7 +938,7 @@
<widget objectName="mCenterSymbolPushButton" class="QPushButton" label=""/>
<widget objectName="mRendererLabel" class="QLabel" label="Renderer:"/>
<widget objectName="mRendererComboBox" class="QComboBox" label=""/>
<widget objectName="mRendererSettingsButton" class="QPushButton" label="Renderer settings..."/>
<widget objectName="mRendererSettingsButton" class="QPushButton" label="Renderer settings…"/>
<widget objectName="mDisplacementCirclesGroupBox" class="QGroupBox" label="">
<widget objectName="mCircleWidthLabel" class="QLabel" label="Circle pen width:"/>
<widget objectName="mCircleColorLabel" class="QLabel" label="Circle color:"/>
Expand All @@ -948,7 +948,7 @@
<widget objectName="mLabelingGroupBox" class="QGroupBox" label="">
<widget objectName="mLabelAttributeLabel" class="QLabel" label="Label attribute:"/>
<widget objectName="mLabelFieldComboBox" class="QComboBox" label=""/>
<widget objectName="mLabelFontButton" class="QPushButton" label="Label font..."/>
<widget objectName="mLabelFontButton" class="QPushButton" label="Label font…"/>
<widget objectName="mLabelColorLabel" class="QLabel" label="Label color:"/>
<widget objectName="mScaleDependentLabelsCheckBox" class="QCheckBox" label="Use scale dependent labeling"/>
<widget objectName="mMaxScaleLabel" class="QLabel" label="max scale denominator:"/>
Expand Down Expand Up @@ -1016,7 +1016,7 @@
<widget objectName="btnRemoveRule" class="QPushButton" label=""/>
<widget objectName="btnRefineRule" class="QPushButton" label="Refine current rules"/>
<widget objectName="btnCountFeatures" class="QPushButton" label="Count features"/>
<widget objectName="btnRenderingOrder" class="QPushButton" label="Rendering order..."/>
<widget objectName="btnRenderingOrder" class="QPushButton" label="Rendering order…"/>
</widget>
<widget objectName="QgsDelAttrDialogBase" class="QDialog" label="">
<widget objectName="buttonBox" class="QDialogButtonBox" label=""/>
Expand Down Expand Up @@ -1296,7 +1296,7 @@
<widget objectName="mCRSWidget" class="QWidget" label="">
<widget objectName="mCRSLabel" class="QLabel" label="Coordinate Reference System:"/>
<widget objectName="mSelectedCRSLabel" class="QLabel" label="Selected Coordinate Reference System"/>
<widget objectName="mChangeCRSButton" class="QPushButton" label="Change ..."/>
<widget objectName="mChangeCRSButton" class="QPushButton" label="Change…"/>
</widget>
<widget objectName="mFormatWidget" class="QWidget" label="">
<widget objectName="mFormatLabel" class="QLabel" label="Format"/>
Expand Down Expand Up @@ -1632,7 +1632,7 @@
<widget objectName="label_4" class="QLabel" label="Column"/>
<widget objectName="cboGraduatedColumn" class="QComboBox" label=""/>
<widget objectName="label_6" class="QLabel" label="Symbol"/>
<widget objectName="btnChangeGraduatedSymbol" class="QPushButton" label="Change..."/>
<widget objectName="btnChangeGraduatedSymbol" class="QPushButton" label="Change…"/>
<widget objectName="label_5" class="QLabel" label="Classes"/>
<widget objectName="spinGraduatedClasses" class="QSpinBox" label="5">
<widget objectName="qt_spinbox_lineedit" class="QLineEdit" label="5"/>
Expand Down Expand Up @@ -1685,7 +1685,7 @@
<widget objectName="widget_3" class="QWidget" label="">
<widget objectName="textLabelFileName" class="QLabel" label="File Name"/>
<widget objectName="txtFilePath" class="QLineEdit" label=""/>
<widget objectName="btnBrowseForFile" class="QPushButton" label="Browse..."/>
<widget objectName="btnBrowseForFile" class="QPushButton" label="Browse…"/>
<widget objectName="textLabelLayerName" class="QLabel" label="Layer name"/>
<widget objectName="txtLayerName" class="QLineEdit" label=""/>
<widget objectName="lblEncoding" class="QLabel" label="Encoding"/>
Expand Down Expand Up @@ -1764,7 +1764,7 @@
<widget objectName="buttonBox" class="QDialogButtonBox" label=""/>
<widget objectName="gbCRS" class="QGroupBox" label="">
<widget objectName="labelCoordRefSys" class="QLabel" label=""/>
<widget objectName="btnChangeSpatialRefSys" class="QPushButton" label="Change ..."/>
<widget objectName="btnChangeSpatialRefSys" class="QPushButton" label="Change…"/>
</widget>
<widget objectName="labelFilter" class="QLabel" label="Filter:"/>
<widget objectName="lineFilter" class="QLineEdit" label=""/>
Expand Down Expand Up @@ -1798,10 +1798,10 @@
<widget objectName="mTileModeCheckBox" class="QCheckBox" label="Create VRT"/>
<widget objectName="mSaveAsLabel" class="QLabel" label="Save as"/>
<widget objectName="mSaveAsLineEdit" class="QLineEdit" label=""/>
<widget objectName="mBrowseButton" class="QPushButton" label="Browse..."/>
<widget objectName="mBrowseButton" class="QPushButton" label="Browse…"/>
<widget objectName="label_2" class="QLabel" label="CRS"/>
<widget objectName="mCrsComboBox" class="QComboBox" label=""/>
<widget objectName="mChangeCrsPushButton" class="QPushButton" label="Change ..."/>
<widget objectName="mChangeCrsPushButton" class="QPushButton" label="Change…"/>
<widget objectName="mScrollArea" class="QScrollArea" label="">
<widget objectName="qt_scrollarea_viewport" class="QWidget" label="">
<widget objectName="scrollAreaWidgetContents" class="QWidget" label=""/>
Expand Down Expand Up @@ -1981,7 +1981,7 @@
<widget objectName="mDrawAnnotationCheckBox" class="QGroupBox" label="">
<widget objectName="mAnnotationDirectionLabel" class="QLabel" label="Annotation direction"/>
<widget objectName="mAnnotationDirectionComboBox" class="QComboBox" label=""/>
<widget objectName="mAnnotationFontButton" class="QPushButton" label="Font..."/>
<widget objectName="mAnnotationFontButton" class="QPushButton" label="Font…"/>
<widget objectName="mDistanceToFrameLabel" class="QLabel" label="Distance to map frame"/>
<widget objectName="mCoordinatePrecisionLabel" class="QLabel" label="Coordinate precision"/>
<widget objectName="mCoordinatePrecisionSpinBox" class="QSpinBox" label="">
Expand Down
2 changes: 1 addition & 1 deletion src/3d/qgstessellator.cpp
View file
Expand Up @@ -470,7 +470,7 @@ void QgsTessellator::addPolygon( const QgsPolygon &polygon, float extrusionHeigh
}
catch ( ... )
{
QgsMessageLog::logMessage( "Triangulation failed. Skipping polygon...", "3D" );
QgsMessageLog::logMessage( QObject::tr( "Triangulation failed. Skipping polygon…" ), QObject::tr( "3D" ) );
}

for ( int i = 0; i < polylinesToDelete.count(); ++i )
Expand Down
4 changes: 2 additions & 2 deletions src/analysis/interpolation/DualEdgeTriangulation.cpp
View file
Expand Up @@ -2610,7 +2610,7 @@ bool DualEdgeTriangulation::readFromTAFF( QString filename )

//import all the DualEdges
QProgressBar *edgebar = new QProgressBar();//use a progress dialog so that it is not boring for the user
edgebar->setCaption( "Reading edges..." );
edgebar->setCaption( "Reading edges…" );
edgebar->setTotalSteps( numberofhalfedges / 2 );
edgebar->setMinimumWidth( 400 );
edgebar->move( 500, 500 );
Expand Down Expand Up @@ -2731,7 +2731,7 @@ bool DualEdgeTriangulation::readFromTAFF( QString filename )
}

QProgressBar *pointbar = new QProgressBar();
pointbar->setCaption( "Reading points..." );
pointbar->setCaption( tr( "Reading points…" ) );
pointbar->setTotalSteps( numberofpoints );
pointbar->setMinimumWidth( 400 );
pointbar->move( 500, 500 );
Expand Down
2 changes: 1 addition & 1 deletion src/app/3d/qgs3dmapcanvasdockwidget.cpp
View file
Expand Up @@ -44,7 +44,7 @@ Qgs3DMapCanvasDockWidget::Qgs3DMapCanvasDockWidget( QWidget *parent )
toolBar->addAction( QgsApplication::getThemeIcon( QStringLiteral( "mActionZoomFullExtent.svg" ) ),
tr( "Zoom Full" ), this, &Qgs3DMapCanvasDockWidget::resetView );
toolBar->addAction( QgsApplication::getThemeIcon( QStringLiteral( "mActionSaveMapAsImage.svg" ) ),
tr( "Save as image..." ), this, &Qgs3DMapCanvasDockWidget::saveAsImage );
tr( "Save as image…" ), this, &Qgs3DMapCanvasDockWidget::saveAsImage );
toolBar->addAction( QgsApplication::getThemeIcon( QStringLiteral( "mIconProperties.svg" ) ),
tr( "Configure" ), this, &Qgs3DMapCanvasDockWidget::configure );

Expand Down
6 changes: 3 additions & 3 deletions src/app/gps/qgsgpsinformationwidget.cpp
View file
Expand Up @@ -428,8 +428,8 @@ void QgsGpsInformationWidget::connectGps()
port = QStringLiteral( "internalGPS" );
}

mGPSPlainTextEdit->appendPlainText( tr( "Connecting..." ) );
showStatusBarMessage( tr( "Connecting to GPS device..." ) );
mGPSPlainTextEdit->appendPlainText( tr( "Connecting…" ) );
showStatusBarMessage( tr( "Connecting to GPS device…" ) );

QgsGpsDetector *detector = new QgsGpsDetector( port );
connect( detector, static_cast < void ( QgsGpsDetector::* )( QgsGpsConnection * ) > ( &QgsGpsDetector::detected ), this, &QgsGpsInformationWidget::connected );
Expand Down Expand Up @@ -501,7 +501,7 @@ void QgsGpsInformationWidget::disconnectGps()
delete mpMapMarker;
mpMapMarker = nullptr;
}
mGPSPlainTextEdit->appendPlainText( tr( "Disconnected..." ) );
mGPSPlainTextEdit->appendPlainText( tr( "Disconnected…" ) );
mConnectButton->setChecked( false );
mConnectButton->setText( tr( "&Connect" ) );
showStatusBarMessage( tr( "Disconnected from GPS device." ) );
Expand Down
16 changes: 8 additions & 8 deletions src/app/layout/qgslayoutdesignerdialog.cpp
View file
Expand Up @@ -2218,7 +2218,7 @@ void QgsLayoutDesignerDialog::printAtlas()

QString error;
std::unique_ptr< QgsFeedback > feedback = qgis::make_unique< QgsFeedback >();
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Printing maps..." ), tr( "Abort" ), 0, 100, this );
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Printing maps…" ), tr( "Abort" ), 0, 100, this );
progressDialog->setWindowTitle( tr( "Printing Atlas" ) );
connect( feedback.get(), &QgsFeedback::progressChanged, this, [ & ]( double progress )
{
Expand Down Expand Up @@ -2387,7 +2387,7 @@ void QgsLayoutDesignerDialog::exportAtlasToRaster()

QString error;
std::unique_ptr< QgsFeedback > feedback = qgis::make_unique< QgsFeedback >();
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering maps..." ), tr( "Abort" ), 0, 100, this );
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering maps…" ), tr( "Abort" ), 0, 100, this );
progressDialog->setWindowTitle( tr( "Exporting Atlas" ) );
connect( feedback.get(), &QgsFeedback::progressChanged, this, [ & ]( double progress )
{
Expand Down Expand Up @@ -2538,7 +2538,7 @@ void QgsLayoutDesignerDialog::exportAtlasToSvg()

QString error;
std::unique_ptr< QgsFeedback > feedback = qgis::make_unique< QgsFeedback >();
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering maps..." ), tr( "Abort" ), 0, 100, this );
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering maps…" ), tr( "Abort" ), 0, 100, this );
progressDialog->setWindowTitle( tr( "Exporting Atlas" ) );
connect( feedback.get(), &QgsFeedback::progressChanged, this, [ & ]( double progress )
{
Expand Down Expand Up @@ -2744,7 +2744,7 @@ void QgsLayoutDesignerDialog::exportAtlasToPdf()

QString error;
std::unique_ptr< QgsFeedback > feedback = qgis::make_unique< QgsFeedback >();
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering maps..." ), tr( "Abort" ), 0, 100, this );
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering maps…" ), tr( "Abort" ), 0, 100, this );
progressDialog->setWindowTitle( tr( "Exporting Atlas" ) );
connect( feedback.get(), &QgsFeedback::progressChanged, this, [ & ]( double progress )
{
Expand Down Expand Up @@ -2868,7 +2868,7 @@ void QgsLayoutDesignerDialog::exportReportToRaster()

QString error;
std::unique_ptr< QgsFeedback > feedback = qgis::make_unique< QgsFeedback >();
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering report..." ), tr( "Abort" ), 0, 0, this );
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering report…" ), tr( "Abort" ), 0, 0, this );
progressDialog->setWindowTitle( tr( "Exporting Report" ) );
connect( feedback.get(), &QgsFeedback::progressChanged, this, [ & ]( double )
{
Expand Down Expand Up @@ -2983,7 +2983,7 @@ void QgsLayoutDesignerDialog::exportReportToSvg()

QString error;
std::unique_ptr< QgsFeedback > feedback = qgis::make_unique< QgsFeedback >();
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering maps..." ), tr( "Abort" ), 0, 0, this );
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering maps…" ), tr( "Abort" ), 0, 0, this );
progressDialog->setWindowTitle( tr( "Exporting Report" ) );
connect( feedback.get(), &QgsFeedback::progressChanged, this, [ & ]( double )
{
Expand Down Expand Up @@ -3117,7 +3117,7 @@ void QgsLayoutDesignerDialog::exportReportToPdf()

QString error;
std::unique_ptr< QgsFeedback > feedback = qgis::make_unique< QgsFeedback >();
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering maps..." ), tr( "Abort" ), 0, 0, this );
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Rendering maps…" ), tr( "Abort" ), 0, 0, this );
progressDialog->setWindowTitle( tr( "Exporting Report" ) );
connect( feedback.get(), &QgsFeedback::progressChanged, this, [ & ]( double )
{
Expand Down Expand Up @@ -3213,7 +3213,7 @@ void QgsLayoutDesignerDialog::printReport()

QString error;
std::unique_ptr< QgsFeedback > feedback = qgis::make_unique< QgsFeedback >();
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Printing maps..." ), tr( "Abort" ), 0, 0, this );
std::unique_ptr< QProgressDialog > progressDialog = qgis::make_unique< QProgressDialog >( tr( "Printing maps…" ), tr( "Abort" ), 0, 0, this );
progressDialog->setWindowTitle( tr( "Printing Report" ) );
connect( feedback.get(), &QgsFeedback::progressChanged, this, [ & ]( double )
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/layout/qgslayoutmapgridwidget.cpp
View file
Expand Up @@ -601,7 +601,7 @@ void QgsLayoutMapGridWidget::setGridItems()

//CRS button
QgsCoordinateReferenceSystem gridCrs = mMapGrid->crs();
QString crsButtonText = gridCrs.isValid() ? gridCrs.authid() : tr( "change..." );
QString crsButtonText = gridCrs.isValid() ? gridCrs.authid() : tr( "Change…" );
mMapGridCRSButton->setText( crsButtonText );
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/layout/qgslayoutpicturewidget.cpp
View file
Expand Up @@ -544,7 +544,7 @@ int QgsLayoutPictureWidget::addDirectoryToPreview( const QString &path )
QFileInfoList fileList = directory.entryInfoList( QDir::Files );
QFileInfoList::const_iterator fileIt = fileList.constBegin();

QProgressDialog progress( QStringLiteral( "Adding Icons..." ), QStringLiteral( "Abort" ), 0, fileList.size() - 1, this );
QProgressDialog progress( tr( "Adding Icons…" ), tr( "Abort" ), 0, fileList.size() - 1, this );
//cancel button does not seem to work properly with modal dialog
//progress.setWindowModality(Qt::WindowModal);

Expand Down

0 comments on commit c3573b1

Please sign in to comment.