german translation update

git-svn-id: http://svn.osgeo.org/qgis/trunk@14348 c8812cc2-4d05-0410-92ff-de0c093fc19c

debian/control

@@ -2,12 +2,13 @@ Source: qgis
 Section: science
 Priority: extra
 Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
-Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev, 
+Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, 
- libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (<< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev, 
+ libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev,
- flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
+ libexpat1-dev, flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0),
- sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
+ python-central (>=0.5), python, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0),
- libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
+ libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0),
- python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev, subversion
+ python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
+ libqwt5-qt4-dev, libspatialite-dev, libfcgi-dev, pkg-config, subversion
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current
@@ -15,7 +16,7 @@ Homepage: http://qgis.org/
 
 Package: qgis
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version}), qgis-providers (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
 Recommends: qgis-plugin-grass, python-qgis
 Suggests: gpsbabel
 Conflicts: uim-qt3
@@ -30,7 +31,6 @@ Description: Geographic Information System (GIS)
 
 Package: qgis-common
 Architecture: all
-Depends: qgis (>= ${binary:Version})
 Description: Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -68,7 +68,7 @@ Description: Quantum GIS - development files
 
 Package: qgis-plugin-grass
 Architecture: any
-Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass
+Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass640+42329
 Description: GRASS plugin for Quantum GIS
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -79,6 +79,8 @@ Description: GRASS plugin for Quantum GIS
 Package: qgis-plugin-grass-common
 Architecture: all
 Depends: python
+Replaces: qgis-common (<< 1.5)
+Breaks: qgis-common (<< 1.5)
 Description: GRASS plugin for Quantum GIS - architecture-independent data
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.
@@ -89,7 +91,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
 Package: python-qgis
 Section: python
 Architecture: any
-Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 XB-Python-Version: ${python:Versions}
 Description: Python bindings to Quantum GIS
@@ -113,7 +115,7 @@ Description: Python bindings to Quantum GIS - architecture-independent files
 
 Package: qgis-providers
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Replaces: qgis (<= 1.6)
 Breaks: qgis (<= 1.6)
 Description: collection of data providers to Quantum GIS

src/app/attributetable/qgsattributetabledialog.cpp

@@ -81,8 +81,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
     QgisApp::instance()->addDockWidget( Qt::BottomDockWidgetArea, mDock );
   }
 
-  setWindowTitle( tr( "Attribute table - %3 :: %1 / %2 features(s) selected", "feature count" ).
+  updateTitle();
-                  arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ) );
 
   mRemoveSelectionButton->setIcon( getThemeIcon( "/mActionUnselectAttributes.png" ) );
   mSelectedToTopButton->setIcon( getThemeIcon( "/mActionSelectedToTop.png" ) );
@@ -140,6 +139,17 @@ QgsAttributeTableDialog::~QgsAttributeTableDialog()
   delete mSelectionModel;
 }
 
+void QgsAttributeTableDialog::updateTitle()
+{
+  setWindowTitle( tr( "Attribute table - %1 :: %n / %2 feature(s) selected",
+                      "feature count",
+                      mView->selectionModel()->selectedRows().size()
+                    )
+                  .arg( mLayer->name() )
+                  .arg( mModel->rowCount() )
+                );
+}
+
 void QgsAttributeTableDialog::closeEvent( QCloseEvent* event )
 {
   QDialog::closeEvent( event );
@@ -305,16 +315,16 @@ void QgsAttributeTableDialog::updateSelection()
 
   mSelectionModel->select( selection, QItemSelectionModel::ClearAndSelect );// | QItemSelectionModel::Columns);
   mView->setSelectionModel( mSelectionModel );
-  setWindowTitle( tr( "Attribute table - %3 :: %1 / %2 features(s) selected", "feature count" ).
+  updateTitle();
-                  arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ) );
 
-  /*for (int i = 0; i < mModel->rowCount(); ++i)
+#if 0
+  for ( int i = 0; i < mModel->rowCount(); ++i )
   {
-  int id = mModel->rowToId(i);
+    int id = mModel->rowToId( i );
-    QgsDebugMsg(id);
+    QgsDebugMsg( id );
   }
-  QgsDebugMsg("--------------");
+  QgsDebugMsg( "--------------" );
-  */
+#endif
 }
 
 void QgsAttributeTableDialog::updateRowPressed( int index )
@@ -354,8 +364,8 @@ void QgsAttributeTableDialog::updateRowSelection( int index )
     }
 
     updateRowSelection( first, last, 3 );
-    setWindowTitle( tr( "Attribute table - %3 :: %1 / %2 features(s) selected", "feature count" ).
+    updateTitle();
-                    arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ) );
+
     mView->setSelectionMode( QAbstractItemView::NoSelection );
     return;
   }
@@ -406,8 +416,7 @@ void QgsAttributeTableDialog::updateRowSelection( int index )
     }
   }
   mView->setSelectionMode( QAbstractItemView::NoSelection );
-  setWindowTitle( tr( "Attribute table - %3 :: %1 / %2 features(s) selected", "feature count" ).
+  updateTitle();
-                  arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ) );
 }
 
 void QgsAttributeTableDialog::updateRowSelection( int first, int last, int clickType )

src/app/attributetable/qgsattributetabledialog.h

@@ -182,6 +182,11 @@ class QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDia
      */
     void doSearch( QString searchString );
 
+    /**
+     * update window title
+     */
+    void updateTitle();
+
     QIcon getThemeIcon( const QString theName );
 
     QLineEdit *mQuery;