Merge pull request #835 from artfwo/more-strings-fixes-in-vector-laye…

…r-properties More untranslatable string fixes in vector layer properties.
qgis · Aug 28, 2013 · d6dd401 · d6dd401
2 parents b0ed8ed + 2101af5
commit d6dd401
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp b/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp
@@ -30,12 +30,12 @@ QgsSmartGroupCondition::QgsSmartGroupCondition( int id, QWidget* parent ) : QWid
 
   mConditionId = id;
 
-  mCondCombo->addItem( "has the tag", QVariant( "tag" ) );
-  mCondCombo->addItem( "is a member of group", QVariant( "group" ) );
-  mCondCombo->addItem( "has a part of name matching", QVariant( "name" ) );
-  mCondCombo->addItem( "does NOT have the tag", QVariant( "!tag" ) );
-  mCondCombo->addItem( "is NOT a member of group", QVariant( "!group" ) );
-  mCondCombo->addItem( "has NO part of name matching", QVariant( "!name" ) );
+  mCondCombo->addItem( tr( "has the tag" ), QVariant( "tag" ) );
+  mCondCombo->addItem( tr( "is a member of group" ), QVariant( "group" ) );
+  mCondCombo->addItem( tr( "has a part of name matching" ), QVariant( "name" ) );
+  mCondCombo->addItem( tr( "does NOT have the tag" ), QVariant( "!tag" ) );
+  mCondCombo->addItem( tr( "is NOT a member of group" ), QVariant( "!group" ) );
+  mCondCombo->addItem( tr( "has NO part of name matching" ), QVariant( "!name" ) );
 
   mRemoveBtn->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) );
 
@@ -83,8 +83,8 @@ QgsSmartGroupEditorDialog::QgsSmartGroupEditorDialog( QgsStyleV2* style, QWidget
 
   mCondCount = 0;
 
-  mAndOrCombo->addItem( "ALL the constraints", QVariant( "AND" ) );
-  mAndOrCombo->addItem( "any ONE of the constraints", QVariant( "OR" ) );
+  mAndOrCombo->addItem( tr( "ALL the constraints" ), QVariant( "AND" ) );
+  mAndOrCombo->addItem( tr( "any ONE of the constraints" ), QVariant( "OR" ) );
 
   mLayout = new QGridLayout( mConditionsBox );
   addCondition();

diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.cpp b/src/gui/symbology-ng/qgssymbolslistwidget.cpp
@@ -71,9 +71,9 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* sty
   }
   // Set the Style Menu under btnStyle
   QMenu *styleMenu = new QMenu( btnStyle );
-  QAction *styleMgrAction = new QAction( "Style Manager", styleMenu );
+  QAction *styleMgrAction = new QAction( tr( "Style Manager" ), styleMenu );
   styleMenu->addAction( styleMgrAction );
-  QAction *saveStyle = new QAction( "Save in symbol library...", styleMenu );
+  QAction *saveStyle = new QAction( tr( "Save in symbol library..." ), styleMenu );
   styleMenu->addAction( saveStyle );
   connect( styleMgrAction, SIGNAL( triggered() ), this, SLOT( openStyleManager() ) );
   connect( saveStyle, SIGNAL( triggered() ), this, SLOT( addSymbolToStyle() ) );