QGis => QGIS updates

qgis · Jun 9, 2013 · 50b96d7 · 50b96d7
1 parent 10f3cf3
commit 50b96d7
Show file tree

Hide file tree

Showing 10 changed files with 144 additions and 769 deletions.
diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS
diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts
diff --git a/python/plugins/db_manager/db_model.py b/python/plugins/db_manager/db_model.py
@@ -530,7 +530,7 @@ def dropMimeData(self, data, action, row, column, parent):
 				parts = mimeUri.split(":", 3)
 				if len(parts) != 4:
 					# invalid qgis mime uri
-					QMessageBox.warning(None, self.tr("Invalid MIME uri"), self.tr("The dropped object is not a valid QGis layer"))
+					QMessageBox.warning(None, self.tr("Invalid MIME uri"), self.tr("The dropped object is not a valid layer"))
 					continue
 
 				layerType, providerKey, layerName, uriString = parts
@@ -553,7 +553,7 @@ def importLayer(self, layerType, providerKey, layerName, uriString, parent):
 
 		if not inLayer.isValid():
 			# invalid layer
-			QMessageBox.warning(None, self.tr("Invalid layer"), self.tr("QGis was unable to load the layer %s") % inLayer.name)
+			QMessageBox.warning(None, self.tr("Invalid layer"), self.tr("Unable to load the layer %s") % inLayer.name)
 			return False
 
 		# retrieve information about the new table's db and schema

diff --git a/python/plugins/db_manager/db_tree.py b/python/plugins/db_manager/db_tree.py
@@ -116,7 +116,7 @@ def contextMenuEvent(self, ev):
 
       if isinstance(item, Table):
         menu.addSeparator()
-        menu.addAction(self.tr("Add to QGis canvas"), self.addLayer)
+        menu.addAction(self.tr("Add to canvas"), self.addLayer)
 
     elif isinstance(item, DBPlugin) and item.database() is not None:
       menu.addAction(self.tr("Re-connect"), self.reconnect)

diff --git a/python/plugins/mapserver_export/mapserverexport.py b/python/plugins/mapserver_export/mapserverexport.py
@@ -242,7 +242,7 @@ def checkCurrentProject(self, forUnload=False):
                       "QGIS Project Files (*.qgs)", "Filter list for selecting files from a dialog box")
           # Check that a file was selected
           if len(saveAsFileName) == 0:
-            QMessageBox.warning(self.dlg, "Not saved!", "QGis project file not saved because no file name was given.")
+            QMessageBox.warning(self.dlg, "Not saved!", "QGIS project file not saved because no file name was given.")
             # fall back to using current project if available
             self.dlg.ui.txtQgisFilePath.setText(project.fileName())
           else:

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -3566,7 +3566,7 @@ void QgisApp::fileOpen()
     QString fullPath = QFileDialog::getOpenFileName( this,
                        tr( "Choose a QGIS project file to open" ),
                        lastUsedDir,
-                       tr( "QGis files" ) + " (*.qgs *.QGS)" );
+                       tr( "QGIS files" ) + " (*.qgs *.QGS)" );
     if ( fullPath.isNull() )
     {
       return;
@@ -3729,7 +3729,7 @@ bool QgisApp::fileSave()
                      this,
                      tr( "Choose a QGIS project file" ),
                      lastUsedDir + "/" + QgsProject::instance()->title(),
-                     tr( "QGis files" ) + " (*.qgs *.QGS)" );
+                     tr( "QGIS files" ) + " (*.qgs *.QGS)" );
     if ( path.isEmpty() )
       return false;
 
@@ -3788,7 +3788,7 @@ void QgisApp::fileSaveAs()
   QString path = QFileDialog::getSaveFileName( this,
                  tr( "Choose a file name to save the QGIS project file as" ),
                  lastUsedDir + "/" + QgsProject::instance()->title(),
-                 tr( "QGis files" ) + " (*.qgs *.QGS)" );
+                 tr( "QGIS files" ) + " (*.qgs *.QGS)" );
   if ( path.isEmpty() )
     return;
 

diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -830,7 +830,7 @@ void QgsOptions::on_mProjectOnLaunchPushBtn_pressed()
   QString projPath = QFileDialog::getOpenFileName( this,
                      tr( "Choose project file to open at launch" ),
                      lastUsedDir,
-                     tr( "QGis files" ) + " (*.qgs *.QGS)" );
+                     tr( "QGIS files" ) + " (*.qgs *.QGS)" );
   if ( !projPath.isNull() )
   {
     mProjectOnLaunchLineEdit->setText( projPath );

diff --git a/src/app/qgsprojectlayergroupdialog.cpp b/src/app/qgsprojectlayergroupdialog.cpp
@@ -109,7 +109,7 @@ void QgsProjectLayerGroupDialog::on_mBrowseFileToolButton_clicked()
   QString projectFile = QFileDialog::getOpenFileName( this,
                         tr( "Select project file" ),
                         s.value( "/qgis/last_embedded_project_path" ).toString() ,
-                        tr( "QGis files" ) + " (*.qgs *.QGS)" );
+                        tr( "QGIS files" ) + " (*.qgs *.QGS)" );
   if ( !projectFile.isEmpty() )
   {
     mProjectFileLineEdit->setText( projectFile );

diff --git a/src/plugins/georeferencer/qgsgeorefpluginguibase.ui b/src/plugins/georeferencer/qgsgeorefpluginguibase.ui
@@ -294,21 +294,21 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Link Georeferencer to QGis</string>
+    <string>Link Georeferencer to QGIS</string>
    </property>
    <property name="statusTip">
-    <string>Link Georeferencer to QGis</string>
+    <string>Link Georeferencer to QGIS</string>
    </property>
   </action>
   <action name="mActionLinkQGisToGeoref">
    <property name="checkable">
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Link QGis to Georeferencer</string>
+    <string>Link QGIS to Georeferencer</string>
    </property>
    <property name="statusTip">
-    <string>Link QGis to Georeferencer</string>
+    <string>Link QGIS to Georeferencer</string>
    </property>
   </action>
   <action name="mActionSaveGCPpoints">

diff --git a/src/plugins/grass/qgsgrassbrowser.cpp b/src/plugins/grass/qgsgrassbrowser.cpp
@@ -390,7 +390,7 @@ void QgsGrassBrowser::deleteMap()
     QString mapset = mModel->itemMapset( index );
     QString map = mModel->itemMap( index );
 
-    // check whether the layer is loaded in QGis canvas
+    // check whether the layer is loaded in canvas
     if ( type == QgsGrassModel::Vector )
     {
       QStringList layers = QgsGrass::vectorLayers( gisbase, location, mapset, map );
@@ -419,7 +419,7 @@ void QgsGrassBrowser::deleteMap()
               grassProvider->freeze();
 #else
             QMessageBox::information( this, tr( "Information" ),
-                                      tr( "Remove the selected layer(s) from QGis canvas before continue." ) );
+                                      tr( "Remove the selected layer(s) from canvas before continue." ) );
             return;
 #endif
           }