Skip to content

Commit c3573b1

Browse files
committedFeb 17, 2018
more translation string fixes and updates
1 parent 030714c commit c3573b1

File tree

73 files changed

+180
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+180
-180
lines changed
 

‎resources/customization.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<widget objectName="editLabel" class="QLineEdit" label=""/>
5555
<widget objectName="label_5" class="QLabel" label="Filter"/>
5656
<widget objectName="editFilter" class="QLineEdit" label=""/>
57-
<widget objectName="btnExpressionBuilder" class="QPushButton" label="..."/>
57+
<widget objectName="btnExpressionBuilder" class="QPushButton" label=""/>
5858
<widget objectName="btnTestFilter" class="QPushButton" label="Test"/>
5959
<widget objectName="label_4" class="QLabel" label="Description"/>
6060
<widget objectName="editDescription" class="QLineEdit" label=""/>
@@ -385,7 +385,7 @@
385385
<widget objectName="label_3" class="QLabel" label="Column"/>
386386
<widget objectName="cboCategorizedColumn" class="QComboBox" label=""/>
387387
<widget objectName="label_9" class="QLabel" label="Symbol"/>
388-
<widget objectName="btnChangeCategorizedSymbol" class="QPushButton" label="Change..."/>
388+
<widget objectName="btnChangeCategorizedSymbol" class="QPushButton" label="Change"/>
389389
<widget objectName="label_10" class="QLabel" label="Color ramp"/>
390390
<widget objectName="btnAddCategories" class="QPushButton" label="Classify"/>
391391
<widget objectName="btnAddCategory" class="QPushButton" label="Add"/>
@@ -445,7 +445,7 @@
445445
</widget>
446446
<widget objectName="mLogFileGroupBox" class="QGroupBox" label="">
447447
<widget objectName="mTxtLogFile" class="QLineEdit" label=""/>
448-
<widget objectName="mBtnLogFile" class="QPushButton" label="..."/>
448+
<widget objectName="mBtnLogFile" class="QPushButton" label=""/>
449449
</widget>
450450
<widget objectName="groupBox" class="QGroupBox" label="">
451451
<widget objectName="radRecenterWhenNeeded" class="QRadioButton" label="when leaving"/>
@@ -629,7 +629,7 @@
629629
<widget objectName="mResultGroupBox" class="QGroupBox" label="">
630630
<widget objectName="mOutputLayerLabel" class="QLabel" label="Output layer"/>
631631
<widget objectName="mOutputLayerLineEdit" class="QLineEdit" label=""/>
632-
<widget objectName="mOutputLayerPushButton" class="QPushButton" label="..."/>
632+
<widget objectName="mOutputLayerPushButton" class="QPushButton" label=""/>
633633
<widget objectName="mCurrentLayerExtentButton" class="QPushButton" label="Current layer extent"/>
634634
<widget objectName="mXMinLabel" class="QLabel" label="X min"/>
635635
<widget objectName="mXMaxLabel" class="QLabel" label="XMax"/>
@@ -770,7 +770,7 @@
770770
<widget objectName="label" class="QLabel" label="Layer name"/>
771771
<widget objectName="leLayerName" class="QLineEdit" label=""/>
772772
<widget objectName="labelCoordRefSys" class="QLabel" label="Coordinate Reference System"/>
773-
<widget objectName="btnChangeSpatialRefSys" class="QPushButton" label="Change ..."/>
773+
<widget objectName="btnChangeSpatialRefSys" class="QPushButton" label="Change"/>
774774
<widget objectName="mTileWidth" class="QLineEdit" label=""/>
775775
<widget objectName="label_2" class="QLabel" label="Tile size"/>
776776
<widget objectName="mTileHeight" class="QLineEdit" label=""/>
@@ -853,8 +853,8 @@
853853
<widget objectName="btnChangeShortcut" class="QPushButton" label="Change"/>
854854
<widget objectName="btnSetNoShortcut" class="QPushButton" label="Set none"/>
855855
<widget objectName="btnResetShortcut" class="QPushButton" label="Set default"/>
856-
<widget objectName="btnLoadShortcuts" class="QPushButton" label="Load..."/>
857-
<widget objectName="btnSaveShortcuts" class="QPushButton" label="Save..."/>
856+
<widget objectName="btnLoadShortcuts" class="QPushButton" label="Load"/>
857+
<widget objectName="btnSaveShortcuts" class="QPushButton" label="Save"/>
858858
<widget objectName="buttonBox" class="QDialogButtonBox" label=""/>
859859
</widget>
860860
<widget objectName="QgsNewSpatialiteLayerDialogBase" class="QDialog" label="">
@@ -938,7 +938,7 @@
938938
<widget objectName="mCenterSymbolPushButton" class="QPushButton" label=""/>
939939
<widget objectName="mRendererLabel" class="QLabel" label="Renderer:"/>
940940
<widget objectName="mRendererComboBox" class="QComboBox" label=""/>
941-
<widget objectName="mRendererSettingsButton" class="QPushButton" label="Renderer settings..."/>
941+
<widget objectName="mRendererSettingsButton" class="QPushButton" label="Renderer settings"/>
942942
<widget objectName="mDisplacementCirclesGroupBox" class="QGroupBox" label="">
943943
<widget objectName="mCircleWidthLabel" class="QLabel" label="Circle pen width:"/>
944944
<widget objectName="mCircleColorLabel" class="QLabel" label="Circle color:"/>
@@ -948,7 +948,7 @@
948948
<widget objectName="mLabelingGroupBox" class="QGroupBox" label="">
949949
<widget objectName="mLabelAttributeLabel" class="QLabel" label="Label attribute:"/>
950950
<widget objectName="mLabelFieldComboBox" class="QComboBox" label=""/>
951-
<widget objectName="mLabelFontButton" class="QPushButton" label="Label font..."/>
951+
<widget objectName="mLabelFontButton" class="QPushButton" label="Label font"/>
952952
<widget objectName="mLabelColorLabel" class="QLabel" label="Label color:"/>
953953
<widget objectName="mScaleDependentLabelsCheckBox" class="QCheckBox" label="Use scale dependent labeling"/>
954954
<widget objectName="mMaxScaleLabel" class="QLabel" label="max scale denominator:"/>
@@ -1016,7 +1016,7 @@
10161016
<widget objectName="btnRemoveRule" class="QPushButton" label=""/>
10171017
<widget objectName="btnRefineRule" class="QPushButton" label="Refine current rules"/>
10181018
<widget objectName="btnCountFeatures" class="QPushButton" label="Count features"/>
1019-
<widget objectName="btnRenderingOrder" class="QPushButton" label="Rendering order..."/>
1019+
<widget objectName="btnRenderingOrder" class="QPushButton" label="Rendering order"/>
10201020
</widget>
10211021
<widget objectName="QgsDelAttrDialogBase" class="QDialog" label="">
10221022
<widget objectName="buttonBox" class="QDialogButtonBox" label=""/>
@@ -1296,7 +1296,7 @@
12961296
<widget objectName="mCRSWidget" class="QWidget" label="">
12971297
<widget objectName="mCRSLabel" class="QLabel" label="Coordinate Reference System:"/>
12981298
<widget objectName="mSelectedCRSLabel" class="QLabel" label="Selected Coordinate Reference System"/>
1299-
<widget objectName="mChangeCRSButton" class="QPushButton" label="Change ..."/>
1299+
<widget objectName="mChangeCRSButton" class="QPushButton" label="Change"/>
13001300
</widget>
13011301
<widget objectName="mFormatWidget" class="QWidget" label="">
13021302
<widget objectName="mFormatLabel" class="QLabel" label="Format"/>
@@ -1632,7 +1632,7 @@
16321632
<widget objectName="label_4" class="QLabel" label="Column"/>
16331633
<widget objectName="cboGraduatedColumn" class="QComboBox" label=""/>
16341634
<widget objectName="label_6" class="QLabel" label="Symbol"/>
1635-
<widget objectName="btnChangeGraduatedSymbol" class="QPushButton" label="Change..."/>
1635+
<widget objectName="btnChangeGraduatedSymbol" class="QPushButton" label="Change"/>
16361636
<widget objectName="label_5" class="QLabel" label="Classes"/>
16371637
<widget objectName="spinGraduatedClasses" class="QSpinBox" label="5">
16381638
<widget objectName="qt_spinbox_lineedit" class="QLineEdit" label="5"/>
@@ -1685,7 +1685,7 @@
16851685
<widget objectName="widget_3" class="QWidget" label="">
16861686
<widget objectName="textLabelFileName" class="QLabel" label="File Name"/>
16871687
<widget objectName="txtFilePath" class="QLineEdit" label=""/>
1688-
<widget objectName="btnBrowseForFile" class="QPushButton" label="Browse..."/>
1688+
<widget objectName="btnBrowseForFile" class="QPushButton" label="Browse"/>
16891689
<widget objectName="textLabelLayerName" class="QLabel" label="Layer name"/>
16901690
<widget objectName="txtLayerName" class="QLineEdit" label=""/>
16911691
<widget objectName="lblEncoding" class="QLabel" label="Encoding"/>
@@ -1764,7 +1764,7 @@
17641764
<widget objectName="buttonBox" class="QDialogButtonBox" label=""/>
17651765
<widget objectName="gbCRS" class="QGroupBox" label="">
17661766
<widget objectName="labelCoordRefSys" class="QLabel" label=""/>
1767-
<widget objectName="btnChangeSpatialRefSys" class="QPushButton" label="Change ..."/>
1767+
<widget objectName="btnChangeSpatialRefSys" class="QPushButton" label="Change"/>
17681768
</widget>
17691769
<widget objectName="labelFilter" class="QLabel" label="Filter:"/>
17701770
<widget objectName="lineFilter" class="QLineEdit" label=""/>
@@ -1798,10 +1798,10 @@
17981798
<widget objectName="mTileModeCheckBox" class="QCheckBox" label="Create VRT"/>
17991799
<widget objectName="mSaveAsLabel" class="QLabel" label="Save as"/>
18001800
<widget objectName="mSaveAsLineEdit" class="QLineEdit" label=""/>
1801-
<widget objectName="mBrowseButton" class="QPushButton" label="Browse..."/>
1801+
<widget objectName="mBrowseButton" class="QPushButton" label="Browse"/>
18021802
<widget objectName="label_2" class="QLabel" label="CRS"/>
18031803
<widget objectName="mCrsComboBox" class="QComboBox" label=""/>
1804-
<widget objectName="mChangeCrsPushButton" class="QPushButton" label="Change ..."/>
1804+
<widget objectName="mChangeCrsPushButton" class="QPushButton" label="Change"/>
18051805
<widget objectName="mScrollArea" class="QScrollArea" label="">
18061806
<widget objectName="qt_scrollarea_viewport" class="QWidget" label="">
18071807
<widget objectName="scrollAreaWidgetContents" class="QWidget" label=""/>
@@ -1981,7 +1981,7 @@
19811981
<widget objectName="mDrawAnnotationCheckBox" class="QGroupBox" label="">
19821982
<widget objectName="mAnnotationDirectionLabel" class="QLabel" label="Annotation direction"/>
19831983
<widget objectName="mAnnotationDirectionComboBox" class="QComboBox" label=""/>
1984-
<widget objectName="mAnnotationFontButton" class="QPushButton" label="Font..."/>
1984+
<widget objectName="mAnnotationFontButton" class="QPushButton" label="Font"/>
19851985
<widget objectName="mDistanceToFrameLabel" class="QLabel" label="Distance to map frame"/>
19861986
<widget objectName="mCoordinatePrecisionLabel" class="QLabel" label="Coordinate precision"/>
19871987
<widget objectName="mCoordinatePrecisionSpinBox" class="QSpinBox" label="">

‎src/3d/qgstessellator.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ void QgsTessellator::addPolygon( const QgsPolygon &polygon, float extrusionHeigh
470470
}
471471
catch ( ... )
472472
{
473-
QgsMessageLog::logMessage( "Triangulation failed. Skipping polygon...", "3D" );
473+
QgsMessageLog::logMessage( QObject::tr( "Triangulation failed. Skipping polygon" ), QObject::tr( "3D" ) );
474474
}
475475

476476
for ( int i = 0; i < polylinesToDelete.count(); ++i )

0 commit comments

Comments
 (0)
Please sign in to comment.