Skip to content

Commit a728aa8

Browse files
author
jef
committed
news fixes, additions and translation string updates
git-svn-id: http://svn.osgeo.org/qgis/trunk@10570 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6425daa commit a728aa8

11 files changed

+441
-449
lines changed

‎src/app/qgisapp.cpp

+79-79
Original file line numberDiff line numberDiff line change
@@ -1853,87 +1853,87 @@ void QgisApp::about()
18531853
abt->setVersion( versionString );
18541854
QString whatsNew = "<html><body>" + tr( "Version" ) + " ";
18551855
whatsNew += QGis::QGIS_VERSION;
1856-
whatsNew += "<h2>" + tr("Whats new in Version 1.1.0?") + "</h2>"
1857-
+ "<p>"
1858-
+ tr("Please note that this is a release in our 'unstable' release series. As such it contains new features and extends the programmatic interface over QGIS 1.0.x. If stability and long term support is more important to you then cool new and untested features, we recommend that you use a copy of QGIS from our stable 1.0.x release series.")
1859-
+ "</p>"
1860-
+ "<p>"
1861-
+ tr("This release includes many bug fixes and enchancements over the QGIS 1.1.0 release. In addition we have added the following new features:")
1862-
+ "</p>"
1863-
+ "<ul>"
1864-
+ "<li>"
1865-
+ tr("Updates to translations.")
1866-
+ "</li>"
1867-
+ "<li>"
1868-
+ tr("Improvements and polishing of the Python plugin installer. Switch to the new official QGIS repository.")
1869-
+ "</li>"
1870-
+ "<li>"
1871-
+ tr("Improvements to themes so that plugins and other parts of the GUI are better supported when switching themes. Addition of the new GIS icon theme.")
1872-
+ "</li>"
1873-
+ "<li>"
1874-
+ tr("Improvements to Debian packaging to better support Debian standard requirements.")
1875-
+ "</li>"
1876-
+ "<li>"
1877-
+ tr("Support usb: as a GPS device under Linux.")
1878-
+ "</li>"
1879-
+ "<li>"
1880-
+ tr("WMS plugin now supports sorting and shows nested layers as a tree. WMS provider also support 24bit png images now. The WMS plugin also now provides a search interface for finding WMS servers.")
1881-
+ "</li>"
1882-
+ "<li>"
1883-
+ tr(" Added svg point symbols symbols from Matt Amos (with his permission).")
1884-
+ "</li>"
1885-
+ "<li>"
1886-
+ tr("Improvements to proxy support and support of proxy in WFS provider. The WFS provider now also shows progress information as it is fetching data.")
1887-
+ "</li>"
1888-
+ "<li>"
1889-
+ tr("Improvements the PostGIS client support. Massive speedups in PostGIS layer rendering can now be achieved by disabling SSL in the connection editor.")
1890-
+ "</li>"
1891-
+ "<li>"
1892-
+ tr("Mapserver Export improvements for continuous color support.")
1893-
+ "</li>"
1894-
+ "<li>"
1895-
+ tr("Added tools menu - the fTools plugins are now part of the core QGIS plugins and will always be installed by default.")
1896-
+ "</li>"
1897-
+ "<li>"
1898-
+ tr("Improvements to the print composer including object alignment options. It is also now possible to print maps as postcript raster or vector. For python programmers, the composer classes now have python bindings.")
1899-
+ "</li>"
1900-
+ "<li>"
1901-
+ tr("When using File - Save as image, the saved image is now georeferenced.")
1902-
+ "</li>"
1903-
+ "<li>"
1904-
+ tr("Projection selector now includes quick selection of recently used CRS's.")
1905-
+ "</li>"
1906-
+ "<li>"
1907-
+ tr("Continuous color renderer supports point symbols now too.")
1908-
+ "</li>"
1909-
+ "<li>"
1910-
+ tr("Improved CMake support for building against dependencies from OSGEO4W (Windows only). Addition of an XCode project of developers building under OSX.")
1911-
+ "</li>"
1912-
+ "<li>"
1913-
+ tr("Updates and cleanups to the GRASS toolbox.")
1914-
+ "</li>"
1915-
+ "<li>"
1916-
+ tr("Changes in open vector dialog to support all drivers available in ogr including database and protocol drivers. This brings with it support for SDE, Oracle Spatial, ESRI personal geodatabase and many more OGR supported data stores. Note that in some cases accessing these may require third party libraries to be on your system.")
1917-
+ "</li>"
1918-
+ "<li>"
1919-
+ tr("The middle mouse button can now be used for panning. ")
1920-
+ "</li>"
1921-
+ "<li>"
1922-
+ tr("A new, faster attribute table implementation.")
1923-
+ "</li>"
1924-
+ "<li>"
1925-
+ tr("Numerous cleanups to the user interface.")
1926-
+ "</li>"
1927-
+ "<li>"
1928-
+ tr("A new provider was added for spatiallite - a geodatabase-in-a-file implementation based on the SQLITE database.")
1929-
+ "</li>"
1930-
+ "<li>"
1931-
+ tr("Vector overlay support that can draw pie and bar charts over vector layers based on attribute data.")
1932-
+ "</li>"
1856+
whatsNew += "<h2>" + tr( "Whats new in Version 1.1.0?" ) + "</h2>"
1857+
+ "<p>"
1858+
+ tr( "Please note that this is a release in our 'unstable' release series. As such it contains new features and extends the programmatic interface over QGIS 1.0.x. If stability and long term support is more important to you then cool new and untested features, we recommend that you use a copy of QGIS from our stable 1.0.x release series." )
1859+
+ "</p>"
1860+
+ "<p>"
1861+
+ tr( "This release includes many bug fixes and enhancements over the QGIS 1.0.0 release. In addition we have added the following new features:" )
1862+
+ "</p>"
1863+
+ "<ul>"
1864+
+ "<li>"
1865+
+ tr( "Updates to translations." )
1866+
+ "</li>"
1867+
+ "<li>"
1868+
+ tr( "Improvements and polishing of the Python plugin installer. Switch to the new official QGIS repository." )
1869+
+ "</li>"
1870+
+ "<li>"
1871+
+ tr( "Improvements to themes so that plugins and other parts of the GUI are better supported when switching themes. Addition of the new GIS icon theme." )
1872+
+ "</li>"
1873+
+ "<li>"
1874+
+ tr( "Improvements to Debian packaging to better support Debian standard requirements." )
1875+
+ "</li>"
1876+
+ "<li>"
1877+
+ tr( "Support usb: as a GPS device under Linux." )
1878+
+ "</li>"
1879+
+ "<li>"
1880+
+ tr( "WMS plugin now supports sorting and shows nested layers as a tree. WMS provider also support 24bit png images now. The WMS plugin also now provides a search interface for finding WMS servers." )
1881+
+ "</li>"
1882+
+ "<li>"
1883+
+ tr( "Added svg point symbols from Matt Amos (with his permission)." )
1884+
+ "</li>"
1885+
+ "<li>"
1886+
+ tr( "Improvements to proxy support and support of proxy in WFS provider. The WFS provider now also shows progress information as it is fetching data." )
1887+
+ "</li>"
1888+
+ "<li>"
1889+
+ tr( "Improvements to PostGIS client support. Massive speedups in PostGIS layer rendering can now be achieved by disabling SSL in the connection editor. Support for usage of ctid column as primary key (softens the requirement for integer primary keys)" )
1890+
+ "</li>"
1891+
+ "<li>"
1892+
+ tr( "Mapserver Export improvements for continuous color support." )
1893+
+ "</li>"
1894+
+ "<li>"
1895+
+ tr( "Added tools menu - the fTools plugin is now part of the core QGIS plugins and will always be installed by default." )
1896+
+ "</li>"
1897+
+ "<li>"
1898+
+ tr( "Improvements to the print composer including object alignment options. It is also now possible to print maps as postcript raster or vector. For python programmers, the composer classes now have python bindings." )
1899+
+ "</li>"
1900+
+ "<li>"
1901+
+ tr( "When using File - Save as image, the saved image is now georeferenced." )
1902+
+ "</li>"
1903+
+ "<li>"
1904+
+ tr( "Projection selector now includes quick selection of recently used CRS's." )
1905+
+ "</li>"
1906+
+ "<li>"
1907+
+ tr( "Continuous color renderer supports point symbols now too." )
1908+
+ "</li>"
1909+
+ "<li>"
1910+
+ tr( "Improved CMake support for building against dependencies from OSGEO4W (Windows only). Addition of an XCode project of developers building under OSX." )
1911+
+ "</li>"
1912+
+ "<li>"
1913+
+ tr( "Updates and cleanups to the GRASS toolbox." )
1914+
+ "</li>"
1915+
+ "<li>"
1916+
+ tr( "Changes in open vector dialog to support all drivers available in ogr including database and protocol drivers. This brings with it support for SDE, Oracle Spatial, ESRI personal geodatabase and many more OGR supported data stores. Note that in some cases accessing these may require third party libraries to be on your system." )
1917+
+ "</li>"
1918+
+ "<li>"
1919+
+ tr( "The middle mouse button can now be used for panning. " )
1920+
+ "</li>"
1921+
+ "<li>"
1922+
+ tr( "A new, faster attribute table implementation." )
1923+
+ "</li>"
1924+
+ "<li>"
1925+
+ tr( "Numerous cleanups to the user interface." )
1926+
+ "</li>"
1927+
+ "<li>"
1928+
+ tr( "A new provider was added for spatiallite - a geodatabase-in-a-file implementation based on the SQLITE database." )
1929+
+ "</li>"
1930+
+ "<li>"
1931+
+ tr( "Vector overlay support that can draw pie and bar charts over vector layers based on attribute data." )
1932+
+ "</li>"
19331933
//+ "<li>"
19341934
//+ tr("X")
19351935
//+ "</li>"
1936-
+ "</ul></body></html>";
1936+
+ "</ul></body></html>";
19371937

19381938
abt->setWhatsNew( whatsNew );
19391939

@@ -5213,7 +5213,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
52135213
mActionSplitFeatures->setEnabled( false );
52145214
if ( vlayer->isEditable() && dprovider->capabilities() & QgsVectorDataProvider::ChangeGeometries )
52155215
{
5216-
mActionMoveVertex->setEnabled( true );
5216+
mActionMoveVertex->setEnabled( true );
52175217
}
52185218
return;
52195219
}

‎src/app/qgsspatialitesourceselect.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ void QgsSpatiaLiteSourceSelect::populateConnectionList()
291291
{
292292
// retrieving the SQLite DB name and full path
293293
QString text = *it + tr( " @ " );
294-
text += settings.value( *it + tr( "/sqlitepath" ), "###unknown###" ).toString();
294+
text += settings.value( *it + "/sqlitepath", "###unknown###" ).toString();
295295

296296
cmbConnections->addItem( text );
297297
++it;
@@ -365,7 +365,7 @@ void QgsSpatiaLiteSourceSelect::deleteConnection()
365365
subKey.truncate( idx );
366366

367367
QString key = "/SpatiaLite/connections/" + subKey;
368-
QString msg = tr( "Are you sure you want to remove the " ) + subKey + tr( " connection and all associated settings?" );
368+
QString msg = tr( "Are you sure you want to remove the %1 connection and all associated settings?" ).arg( subKey );
369369
QMessageBox::StandardButton result =
370370
QMessageBox::information( this, tr( "Confirm Delete" ), msg, QMessageBox::Ok | QMessageBox::Cancel );
371371
if ( result == QMessageBox::Ok )

‎src/plugins/copyright_label/pluginguibase.ui

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ p, li { white-space: pre-wrap; }
158158
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
159159
p, li { white-space: pre-wrap; }
160160
&lt;/style>&lt;/head>&lt;body style=" font-family:'Verdana'; font-size:10pt; font-weight:400; font-style:normal;">
161-
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">© QGIS 2008&lt;/p>&lt;/body>&lt;/html></string>
161+
&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">© QGIS 2009&lt;/p>&lt;/body>&lt;/html></string>
162162
</property>
163163
</widget>
164164
</item>

‎src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ int QgsSVGDiagramFactoryWidget::addDirectoryToPreview( const QString& path )
179179
for ( ; fileIt != fileList.constEnd(); ++fileIt )
180180
{
181181

182-
progress.setLabelText( tr( "Creating icon for file " ) + fileIt->fileName() );
182+
progress.setLabelText( tr( "Creating icon for file %1" ).arg( fileIt->fileName() ) );
183183
progress.setValue( counter );
184184
QCoreApplication::processEvents();
185185
if ( progress.wasCanceled() )

‎src/plugins/georeferencer/qgspointdialog.cpp

+5-10
Original file line numberDiff line numberDiff line change
@@ -302,9 +302,7 @@ bool QgsPointDialog::generateWorldFileAndWarp()
302302
if ( QFile::exists( worldFileName ) )
303303
{
304304
int r = QMessageBox::question( this, tr( "World file exists" ),
305-
tr( "<p>The selected file already seems to have a " ) +
306-
tr( "world file! Do you want to replace it with the " ) +
307-
tr( "new world file?</p>" ),
305+
tr( "<p>The selected file already seems to have a world file! Do you want to replace it with the new world file?</p>" ),
308306
QMessageBox::Yes | QMessageBox::Default,
309307
QMessageBox::No | QMessageBox::Escape );
310308
if ( r == QMessageBox::No )
@@ -438,9 +436,8 @@ bool QgsPointDialog::generateWorldFileAndWarp()
438436
else
439437
{
440438
QMessageBox::critical( this, tr( "Not implemented!" ),
441-
tr( "<p>The " ) +
442-
cmbTransformType->currentText() +
443-
tr( " transform is not yet supported.</p>" ) );
439+
tr( "<p>The %1 transform is not yet supported.</p>" )
440+
.arg( cmbTransformType->currentText() ) );
444441
return false;
445442
}
446443
}
@@ -480,7 +477,7 @@ bool QgsPointDialog::generateWorldFileAndWarp()
480477
if ( !file.open( QIODevice::WriteOnly ) )
481478
{
482479
QMessageBox::critical( this, tr( "Error" ),
483-
tr( "Could not write to " ) + worldFileName );
480+
tr( "Could not write to %1" ).arg( worldFileName ) );
484481
return false;
485482
}
486483
QTextStream stream( &file );
@@ -667,9 +664,7 @@ void QgsPointDialog::on_pbnSelectRaster_clicked()
667664
if ( QFile::exists( worldfile ) )
668665
{
669666
int r = QMessageBox::question( this, tr( "World file exists" ),
670-
tr( "<p>The selected file already seems to have a " ) +
671-
tr( "world file! Do you want to replace it with the " ) +
672-
tr( "new world file?</p>" ),
667+
tr( "<p>The selected file already seems to have a world file! Do you want to replace it with the new world file?</p>" ),
673668
QMessageBox::Yes | QMessageBox::Default,
674669
QMessageBox::No | QMessageBox::Escape );
675670
if ( r == QMessageBox::No )

0 commit comments

Comments
 (0)