qgis · Apr 5, 2010
diff --git a/‎i18n/qgis_de.ts
Lines changed: 1136 additions & 1138 deletions b/‎i18n/qgis_de.ts
Lines changed: 1136 additions & 1138 deletions
diff --git a/‎src/providers/postgres/qgspostgresprovider.cpp
Lines changed: 8 additions & 8 deletions b/‎src/providers/postgres/qgspostgresprovider.cpp
Lines changed: 8 additions & 8 deletions
@@ -1097,7 +1097,7 @@ QString QgsPostgresProvider::getPrimaryKey()
       {
         showMessageBox( tr( "No suitable key column in table" ),
                         tr( "The table has no column suitable for use as a key.\n\n"
-                            "Qgis requires that the table either has a column of type\n"
+                            "Quantum GIS requires that the table either has a column of type\n"
                             "int4 with a unique constraint on it (which includes the\n"
                             "primary key), has a PostgreSQL oid column or has a ctid\n"
                             "column with a 16bit block number.\n" ) );
@@ -1171,7 +1171,7 @@ QString QgsPostgresProvider::getPrimaryKey()
           QString columnType = QString::fromUtf8( PQgetvalue( types, 0, 1 ) );
 
           if ( columnType != "int4" )
-            log.append( tr( "The unique index on column '%1' is unsuitable because Qgis does not currently "
+            log.append( tr( "The unique index on column '%1' is unsuitable because Quantum GIS does not currently "
                             "support non-int4 type columns as a key into the table.\n" ).arg( columnName ) );
           else
           {
@@ -1202,7 +1202,7 @@ QString QgsPostgresProvider::getPrimaryKey()
             colNames += ",";
         }
 
-        log.append( tr( "The unique index based on columns %1 is unsuitable because Qgis does not currently "
+        log.append( tr( "The unique index based on columns %1 is unsuitable because Quantum GIS does not currently "
                         "support multiple columns as a key into the table.\n" ).arg( colNames ) );
       }
     }
@@ -1262,11 +1262,11 @@ QString QgsPostgresProvider::getPrimaryKey()
 
   if ( !primaryKey.isNull() )
   {
-    QgsDebugMsg( "Qgis row key is " + primaryKey );
+    QgsDebugMsg( "row key is " + primaryKey );
   }
   else
   {
-    QgsDebugMsg( "Qgis row key was not set." );
+    QgsDebugMsg( "row key was not set." );
   }
 
   return primaryKey;
@@ -1490,7 +1490,7 @@ QString QgsPostgresProvider::chooseViewColumn( const tableCols &cols )
   {
     valid = false;
     log.prepend( tr( "The view '%1.%2' has no column suitable for use as a unique key.\n"
-                     "Qgis requires that the view has a column that can be used "
+                     "Quantum GIS requires that the view has a column that can be used "
                      "as a unique key. Such a column should be derived from "
                      "a table column of type int4 and be a primary key, "
                      "have a unique constraint on it, or be a PostgreSQL "
@@ -2966,14 +2966,14 @@ bool QgsPostgresProvider::getGeometryDetails()
     else
     {
       showMessageBox( tr( "Unknown geometry type" ),
-                      tr( "Column %1 in %2 has a geometry type of %3, which Qgis does not currently support." )
+                      tr( "Column %1 in %2 has a geometry type of %3, which Quantum GIS does not currently support." )
                       .arg( geometryColumn ).arg( mSchemaTableName ).arg( fType ) );
       valid = false;
     }
   }
   else // something went wrong...
   {
-    log.prepend( tr( "Qgis was unable to determine the type and srid of column %1 in %2. The database communication log was:\n%3" )
+    log.prepend( tr( "Quantum GIS was unable to determine the type and srid of column %1 in %2. The database communication log was:\n%3" )
                  .arg( geometryColumn )
                  .arg( mSchemaTableName )
                  .arg( QString::fromUtf8( PQresultErrorMessage( result ) ) ) );
Original file line number	Diff line number	Diff line change
`@@ -1097,7 +1097,7 @@ QString QgsPostgresProvider::getPrimaryKey()`
`1097`	`1097`	`{`
`1098`	`1098`	`showMessageBox( tr( "No suitable key column in table" ),`
`1099`	`1099`	`tr( "The table has no column suitable for use as a key.\n\n"`
`1100`		`- "Qgis requires that the table either has a column of type\n"`
	`1100`	`+ "Quantum GIS requires that the table either has a column of type\n"`
`1101`	`1101`	`"int4 with a unique constraint on it (which includes the\n"`
`1102`	`1102`	`"primary key), has a PostgreSQL oid column or has a ctid\n"`
`1103`	`1103`	`"column with a 16bit block number.\n" ) );`
`@@ -1171,7 +1171,7 @@ QString QgsPostgresProvider::getPrimaryKey()`
`1171`	`1171`	`QString columnType = QString::fromUtf8( PQgetvalue( types, 0, 1 ) );`
`1172`	`1172`
`1173`	`1173`	`if ( columnType != "int4" )`
`1174`		`- log.append( tr( "The unique index on column '%1' is unsuitable because Qgis does not currently "`
	`1174`	`+ log.append( tr( "The unique index on column '%1' is unsuitable because Quantum GIS does not currently "`
`1175`	`1175`	`"support non-int4 type columns as a key into the table.\n" ).arg( columnName ) );`
`1176`	`1176`	`else`
`1177`	`1177`	`{`
`@@ -1202,7 +1202,7 @@ QString QgsPostgresProvider::getPrimaryKey()`
`1202`	`1202`	`colNames += ",";`
`1203`	`1203`	`}`
`1204`	`1204`
`1205`		`- log.append( tr( "The unique index based on columns %1 is unsuitable because Qgis does not currently "`
	`1205`	`+ log.append( tr( "The unique index based on columns %1 is unsuitable because Quantum GIS does not currently "`
`1206`	`1206`	`"support multiple columns as a key into the table.\n" ).arg( colNames ) );`
`1207`	`1207`	`}`
`1208`	`1208`	`}`
`@@ -1262,11 +1262,11 @@ QString QgsPostgresProvider::getPrimaryKey()`
`1262`	`1262`
`1263`	`1263`	`if ( !primaryKey.isNull() )`
`1264`	`1264`	`{`
`1265`		`- QgsDebugMsg( "Qgis row key is " + primaryKey );`
	`1265`	`+ QgsDebugMsg( "row key is " + primaryKey );`
`1266`	`1266`	`}`
`1267`	`1267`	`else`
`1268`	`1268`	`{`
`1269`		`- QgsDebugMsg( "Qgis row key was not set." );`
	`1269`	`+ QgsDebugMsg( "row key was not set." );`
`1270`	`1270`	`}`
`1271`	`1271`
`1272`	`1272`	`return primaryKey;`
`@@ -1490,7 +1490,7 @@ QString QgsPostgresProvider::chooseViewColumn( const tableCols &cols )`
`1490`	`1490`	`{`
`1491`	`1491`	`valid = false;`
`1492`	`1492`	`log.prepend( tr( "The view '%1.%2' has no column suitable for use as a unique key.\n"`
`1493`		`- "Qgis requires that the view has a column that can be used "`
	`1493`	`+ "Quantum GIS requires that the view has a column that can be used "`
`1494`	`1494`	`"as a unique key. Such a column should be derived from "`
`1495`	`1495`	`"a table column of type int4 and be a primary key, "`
`1496`	`1496`	`"have a unique constraint on it, or be a PostgreSQL "`
`@@ -2966,14 +2966,14 @@ bool QgsPostgresProvider::getGeometryDetails()`
`2966`	`2966`	`else`
`2967`	`2967`	`{`
`2968`	`2968`	`showMessageBox( tr( "Unknown geometry type" ),`
`2969`		`- tr( "Column %1 in %2 has a geometry type of %3, which Qgis does not currently support." )`
	`2969`	`+ tr( "Column %1 in %2 has a geometry type of %3, which Quantum GIS does not currently support." )`
`2970`	`2970`	`.arg( geometryColumn ).arg( mSchemaTableName ).arg( fType ) );`
`2971`	`2971`	`valid = false;`
`2972`	`2972`	`}`
`2973`	`2973`	`}`
`2974`	`2974`	`else // something went wrong...`
`2975`	`2975`	`{`
`2976`		`- log.prepend( tr( "Qgis was unable to determine the type and srid of column %1 in %2. The database communication log was:\n%3" )`
	`2976`	`+ log.prepend( tr( "Quantum GIS was unable to determine the type and srid of column %1 in %2. The database communication log was:\n%3" )`
`2977`	`2977`	`.arg( geometryColumn )`
`2978`	`2978`	`.arg( mSchemaTableName )`
`2979`	`2979`	`.arg( QString::fromUtf8( PQresultErrorMessage( result ) ) ) );`