Skip to content

Commit 9da79ea

Browse files
author
jef
committedOct 6, 2010
german translation update
git-svn-id: http://svn.osgeo.org/qgis/trunk@14348 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 20ee70f commit 9da79ea

File tree

4 files changed

+1514
-1145
lines changed

4 files changed

+1514
-1145
lines changed
 

‎debian/control

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@ Source: qgis
22
Section: science
33
Priority: extra
44
Maintainer: Quantum GIS developers <qgis-developer@lists.osgeo.org>
5-
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6-
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (<< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev,
7-
flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8-
sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
9-
libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10-
python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev, libfcgi-dev, subversion
5+
Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev,
6+
libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev,
7+
libexpat1-dev, flex, bison, python-dev, cmake (>= 2.6), python-sip (>= 4.5.0),
8+
python-central (>=0.5), python, libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0),
9+
libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0),
10+
python-qt4-dev (>=4.1.0), python-sip-dev (>= 4.5.0), pyqt4-dev-tools,
11+
libqwt5-qt4-dev, libspatialite-dev, libfcgi-dev, pkg-config, subversion
1112
Build-Conflicts: libqgis-dev, qgis-dev
1213
Standards-Version: 3.8.4
1314
XS-Python-Version: current
1415
Homepage: http://qgis.org/
1516

1617
Package: qgis
1718
Architecture: any
18-
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version}), qgis-providers (= ${binary:Version})
19+
Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-providers (= ${binary:Version}), qgis-common (= ${source:Version})
1920
Recommends: qgis-plugin-grass, python-qgis
2021
Suggests: gpsbabel
2122
Conflicts: uim-qt3
@@ -30,7 +31,6 @@ Description: Geographic Information System (GIS)
3031

3132
Package: qgis-common
3233
Architecture: all
33-
Depends: qgis (>= ${binary:Version})
3434
Description: Quantum GIS - architecture-independent data
3535
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
3636
and display databases of geographic information.
@@ -68,7 +68,7 @@ Description: Quantum GIS - development files
6868

6969
Package: qgis-plugin-grass
7070
Architecture: any
71-
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass
71+
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass640+42329
7272
Description: GRASS plugin for Quantum GIS
7373
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
7474
and display databases of geographic information.
@@ -79,6 +79,8 @@ Description: GRASS plugin for Quantum GIS
7979
Package: qgis-plugin-grass-common
8080
Architecture: all
8181
Depends: python
82+
Replaces: qgis-common (<< 1.5)
83+
Breaks: qgis-common (<< 1.5)
8284
Description: GRASS plugin for Quantum GIS - architecture-independent data
8385
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
8486
and display databases of geographic information.
@@ -89,7 +91,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
8991
Package: python-qgis
9092
Section: python
9193
Architecture: any
92-
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
94+
Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
9395
Provides: ${python:Provides}
9496
XB-Python-Version: ${python:Versions}
9597
Description: Python bindings to Quantum GIS
@@ -113,7 +115,7 @@ Description: Python bindings to Quantum GIS - architecture-independent files
113115

114116
Package: qgis-providers
115117
Architecture: any
116-
Depends: ${shlibs:Depends}, ${misc:Depends}
118+
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
117119
Replaces: qgis (<= 1.6)
118120
Breaks: qgis (<= 1.6)
119121
Description: collection of data providers to Quantum GIS

‎i18n/qgis_de.ts

Lines changed: 1474 additions & 1121 deletions
Large diffs are not rendered by default.

‎src/app/attributetable/qgsattributetabledialog.cpp

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
8181
QgisApp::instance()->addDockWidget( Qt::BottomDockWidgetArea, mDock );
8282
}
8383

84-
setWindowTitle( tr( "Attribute table - %3 :: %1 / %2 features(s) selected", "feature count" ).
85-
arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ) );
84+
updateTitle();
8685

8786
mRemoveSelectionButton->setIcon( getThemeIcon( "/mActionUnselectAttributes.png" ) );
8887
mSelectedToTopButton->setIcon( getThemeIcon( "/mActionSelectedToTop.png" ) );
@@ -140,6 +139,17 @@ QgsAttributeTableDialog::~QgsAttributeTableDialog()
140139
delete mSelectionModel;
141140
}
142141

142+
void QgsAttributeTableDialog::updateTitle()
143+
{
144+
setWindowTitle( tr( "Attribute table - %1 :: %n / %2 feature(s) selected",
145+
"feature count",
146+
mView->selectionModel()->selectedRows().size()
147+
)
148+
.arg( mLayer->name() )
149+
.arg( mModel->rowCount() )
150+
);
151+
}
152+
143153
void QgsAttributeTableDialog::closeEvent( QCloseEvent* event )
144154
{
145155
QDialog::closeEvent( event );
@@ -305,16 +315,16 @@ void QgsAttributeTableDialog::updateSelection()
305315

306316
mSelectionModel->select( selection, QItemSelectionModel::ClearAndSelect );// | QItemSelectionModel::Columns);
307317
mView->setSelectionModel( mSelectionModel );
308-
setWindowTitle( tr( "Attribute table - %3 :: %1 / %2 features(s) selected", "feature count" ).
309-
arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ) );
318+
updateTitle();
310319

311-
/*for (int i = 0; i < mModel->rowCount(); ++i)
320+
#if 0
321+
for ( int i = 0; i < mModel->rowCount(); ++i )
312322
{
313-
int id = mModel->rowToId(i);
314-
QgsDebugMsg(id);
323+
int id = mModel->rowToId( i );
324+
QgsDebugMsg( id );
315325
}
316-
QgsDebugMsg("--------------");
317-
*/
326+
QgsDebugMsg( "--------------" );
327+
#endif
318328
}
319329

320330
void QgsAttributeTableDialog::updateRowPressed( int index )
@@ -354,8 +364,8 @@ void QgsAttributeTableDialog::updateRowSelection( int index )
354364
}
355365

356366
updateRowSelection( first, last, 3 );
357-
setWindowTitle( tr( "Attribute table - %3 :: %1 / %2 features(s) selected", "feature count" ).
358-
arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ) );
367+
updateTitle();
368+
359369
mView->setSelectionMode( QAbstractItemView::NoSelection );
360370
return;
361371
}
@@ -406,8 +416,7 @@ void QgsAttributeTableDialog::updateRowSelection( int index )
406416
}
407417
}
408418
mView->setSelectionMode( QAbstractItemView::NoSelection );
409-
setWindowTitle( tr( "Attribute table - %3 :: %1 / %2 features(s) selected", "feature count" ).
410-
arg( mView->selectionModel()->selectedRows().size() ).arg( mModel->rowCount() ).arg( mLayer->name() ) );
419+
updateTitle();
411420
}
412421

413422
void QgsAttributeTableDialog::updateRowSelection( int first, int last, int clickType )

‎src/app/attributetable/qgsattributetabledialog.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ class QgsAttributeTableDialog : public QDialog, private Ui::QgsAttributeTableDia
182182
*/
183183
void doSearch( QString searchString );
184184

185+
/**
186+
* update window title
187+
*/
188+
void updateTitle();
189+
185190
QIcon getThemeIcon( const QString theName );
186191

187192
QLineEdit *mQuery;

0 commit comments

Comments
 (0)
Please sign in to comment.