Applied patch #603. Thanks! (also fixed a compilation error introduced in r6610)

homann · homann · commit 0ea1add640b6 · 2007-02-17T17:30:54.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6618 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsattributeactiondialog.cpp b/src/app/qgsattributeactiondialog.cpp
@@ -54,9 +54,9 @@ QgsAttributeActionDialog::QgsAttributeActionDialog(QgsAttributeAction* actions,
 void QgsAttributeActionDialog::init()
 {
   Q3Header* header = attributeActionTable->horizontalHeader();
-  header->setLabel(0, "Name");
-  header->setLabel(1, "Action");
-  header->setLabel(2, "Capture");
+  header->setLabel(0, tr("Name") );
+  header->setLabel(1, tr("Action") );
+  header->setLabel(2, tr("Capture") );
 
   attributeActionTable->setColumnStretchable(0, true);
   attributeActionTable->setColumnStretchable(1, true);
@@ -139,7 +139,7 @@ void QgsAttributeActionDialog::browse()
   // widget 
 
   QString action = QFileDialog::getOpenFileName(
-    this, "Select an action");
+    this, tr("Select an action","File dialog window title") );
 
   if (!action.isNull())
     actionAction->insert(action);    
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -1240,7 +1240,7 @@ void QgsPostgresProvider::findColumns(tableCols& cols)
                 "\"?\\.\"?" + QRegExp::escape(temp.column_name) +
                 "\"? AS \"?(\\w+)\"?,* .*");
  
-      QgsDebugMsg(viewQuery + "\n" + viewDef + "\n" + s.pattern());
+      QgsDebugMsg(viewDef + "\n" + s.pattern());
 
       if (s.indexIn(viewDef) != -1)
       {

Original file line number	Diff line number	Diff line change
`@@ -1240,7 +1240,7 @@ void QgsPostgresProvider::findColumns(tableCols& cols)`
`1240`	`1240`	`"\"?\\.\"?" + QRegExp::escape(temp.column_name) +`
`1241`	`1241`	`"\"? AS \"?(\\w+)\"?,* .*");`
`1242`	`1242`
`1243`		`- QgsDebugMsg(viewQuery + "\n" + viewDef + "\n" + s.pattern());`
	`1243`	`+ QgsDebugMsg(viewDef + "\n" + s.pattern());`
`1244`	`1244`
`1245`	`1245`	`if (s.indexIn(viewDef) != -1)`
`1246`	`1246`	`{`