Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix translation strings (fixes #8057)
  • Loading branch information
jef-n committed Jun 15, 2013
1 parent 6199c2c commit e449078
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/app/composer/qgscomposerscalebarwidget.cpp
Expand Up @@ -251,7 +251,7 @@ void QgsComposerScaleBarWidget::on_mNumberOfSegmentsSpinBox_valueChanged( int i
return;
}

mComposerScaleBar->beginCommand( tr( "Scalebar n segments" ), QgsComposerMergeCommand::ScaleBarNSegments );
mComposerScaleBar->beginCommand( tr( "Number of scalebar segments changed" ), QgsComposerMergeCommand::ScaleBarNSegments );
disconnectUpdateSignal();
mComposerScaleBar->setNumSegments( i );
mComposerScaleBar->update();
Expand Down
4 changes: 2 additions & 2 deletions src/core/composer/qgscomposition.cpp
Expand Up @@ -992,7 +992,7 @@ void QgsComposition::alignSelectedItemsHCenter()
double averageXCoord = ( selectedItemBBox.left() + selectedItemBBox.right() ) / 2.0;

//place items
QUndoCommand* parentCommand = new QUndoCommand( tr( "Aligned items hcenter" ) );
QUndoCommand* parentCommand = new QUndoCommand( tr( "Aligned items horizontal center" ) );
QList<QgsComposerItem*>::iterator align_it = selectedItems.begin();
for ( ; align_it != selectedItems.end(); ++align_it )
{
Expand Down Expand Up @@ -1082,7 +1082,7 @@ void QgsComposition::alignSelectedItemsVCenter()
}

double averageYCoord = ( selectedItemBBox.top() + selectedItemBBox.bottom() ) / 2.0;
QUndoCommand* parentCommand = new QUndoCommand( tr( "Aligned items vcenter" ) );
QUndoCommand* parentCommand = new QUndoCommand( tr( "Aligned items vertical center" ) );
QList<QgsComposerItem*>::iterator align_it = selectedItems.begin();
for ( ; align_it != selectedItems.end(); ++align_it )
{
Expand Down
2 changes: 1 addition & 1 deletion src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
Expand Up @@ -702,7 +702,7 @@ QVariant QgsRuleBasedRendererV2Model::headerData( int section, Qt::Orientation o
{
if ( orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= 0 && section < 7 )
{
QStringList lst; lst << tr( "Label" ) << tr( "Rule" ) << tr( "Min. scale" ) << tr( "Max.scale" ) << tr( "Count" ) << tr( "Duplicate count" );
QStringList lst; lst << tr( "Label" ) << tr( "Rule" ) << tr( "Min. scale" ) << tr( "Max. scale" ) << tr( "Count" ) << tr( "Duplicate count" );
return lst[section];
}
else if ( orientation == Qt::Horizontal && role == Qt::ToolTipRole )
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgisapp.ui
Expand Up @@ -1605,7 +1605,7 @@ Ctl (Cmd) increments by 15 deg.</string>
</action>
<action name="actionActionCatchForCustomization">
<property name="text">
<string>mActionCatchForCustomization</string>
<string notr="true">mActionCatchForCustomization</string>
</property>
<property name="toolTip">
<string>This is here just to avoid shortcut conflicts, the shortcut is caught in QgsCustomization</string>
Expand Down
36 changes: 18 additions & 18 deletions src/ui/qgscomposermapwidgetbase.ui
Expand Up @@ -54,9 +54,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-202</y>
<width>440</width>
<height>1380</height>
<y>0</y>
<width>438</width>
<height>1454</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -299,19 +299,6 @@
<item row="0" column="1">
<widget class="QComboBox" name="mGridTypeComboBox"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mIntervalXLabel">
<property name="text">
<string>Interval</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mIntervalXSpinBox</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
Expand Down Expand Up @@ -345,7 +332,7 @@
<item row="2" column="0">
<widget class="QLabel" name="mOffsetXLabel">
<property name="text">
<string>Offset X</string>
<string>Offset</string>
</property>
<property name="wordWrap">
<bool>false</bool>
Expand Down Expand Up @@ -458,6 +445,19 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="mIntervalXLabel">
<property name="text">
<string>Interval</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
<property name="buddy">
<cstring>mIntervalXSpinBox</cstring>
</property>
</widget>
</item>
</layout>
</item>
<item>
Expand Down Expand Up @@ -723,7 +723,7 @@
<class>QgsColorButton</class>
<extends>QPushButton</extends>
<header>qgscolorbutton.h</header>
</customwidget>
</customwidget>
</customwidgets>
<resources/>
<connections/>
Expand Down

0 comments on commit e449078

Please sign in to comment.