[QGIS Commit] r13516 - in trunk/qgis: i18n src/app src/app/legend

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-17 11:06:24 -0400 (Mon, 17 May 2010)
New Revision: 13516

Modified:
   trunk/qgis/i18n/qgis_de.ts
   trunk/qgis/src/app/legend/qgslegendlayer.cpp
   trunk/qgis/src/app/qgisapp.cpp
Log:
fix query translation

Modified: trunk/qgis/i18n/qgis_de.ts
===================================================================
--- trunk/qgis/i18n/qgis_de.ts	2010-05-17 12:37:21 UTC (rev 13515)
+++ trunk/qgis/i18n/qgis_de.ts	2010-05-17 15:06:24 UTC (rev 13516)
@@ -5445,7 +5445,7 @@
     </message>
     <message>
         <location filename="../src/app/qgisapp.cpp" line="1058"/>
-        <source>Subset...</source>
+        <source>Query...</source>
         <translation>Abfrage...</translation>
     </message>
     <message>
@@ -15296,8 +15296,8 @@
     </message>
     <message>
         <location filename="../src/app/legend/qgslegendlayer.cpp" line="433"/>
-        <source>&amp;Subset</source>
-        <translation>&amp;Untermenge</translation>
+        <source>&amp;Query...</source>
+        <translation>&amp;Abfrage...</translation>
     </message>
     <message>
         <location filename="../src/app/legend/qgslegendlayer.cpp" line="440"/>

Modified: trunk/qgis/src/app/legend/qgslegendlayer.cpp
===================================================================
--- trunk/qgis/src/app/legend/qgslegendlayer.cpp	2010-05-17 12:37:21 UTC (rev 13515)
+++ trunk/qgis/src/app/legend/qgslegendlayer.cpp	2010-05-17 15:06:24 UTC (rev 13516)
@@ -430,7 +430,7 @@
       saveSelectionAsAction->setEnabled( false );
     }
 
-    theMenu.addAction( tr( "&Subset" ), QgisApp::instance(), SLOT( layerSubsetString() ) );
+    theMenu.addAction( tr( "&Query..." ), QgisApp::instance(), SLOT( layerSubsetString() ) );
 
     theMenu.addSeparator();
   }

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-05-17 12:37:21 UTC (rev 13515)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-05-17 15:06:24 UTC (rev 13516)
@@ -1055,7 +1055,7 @@
   connect( mActionLayerProperties, SIGNAL( triggered() ), this, SLOT( layerProperties() ) );
   mActionLayerProperties->setEnabled( false );
 
-  mActionLayerSubsetString = new QAction( tr( "Subset..." ), this );
+  mActionLayerSubsetString = new QAction( tr( "Query..." ), this );
   shortcuts->registerAction( mActionLayerSubsetString );
   mActionLayerProperties->setStatusTip( tr( "Set subset query of the current layer" ) );
   connect( mActionLayerSubsetString, SIGNAL( triggered() ), this, SLOT( layerSubsetString() ) );
@@ -5821,6 +5821,7 @@
     mActionLayerSaveAs->setEnabled( true );
     mActionLayerSelectionSaveAs->setEnabled( true );
     mActionCopyFeatures->setEnabled( layerHasSelection );
+    mActionLayerSubsetString->setEnabled( true );
 
     if ( !vlayer->isEditable() && mMapCanvas->mapTool() && mMapCanvas->mapTool()->isEditTool() )
     {