Skip to content

Commit

Permalink
Undoing some changes in r7813
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7815 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
homann committed Dec 27, 2007
1 parent 9c9b592 commit 0f85d10
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

SUBDIRS (copyright_label delimited_text grid_maker north_arrow scale_bar evis)
SUBDIRS (copyright_label delimited_text grid_maker north_arrow scale_bar)

IF (POSTGRES_FOUND)
SUBDIRS (geoprocessing spit)
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/gps_importer/qgsgpsplugingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -410,10 +410,10 @@ void QgsGPSPluginGui::populateCONVDialog() {

QString format = QString("<html><body><p>%1 %2<p>%3</body></html>");

QString sentence1 = tr("QGIS can perform conversions of GPX files, by using GPSBabel (%1) to perform the conversions.","Description")
QString sentence1 = tr("QGIS can perform conversions of GPX files, by using GPSBabel (%1) to perform the conversions.")
.arg("<a href=\"http://www.gpsbabel.org\">http://www.gpsbabel.org</a>");
QString sentence2 = tr("This requires that you have GPSBabel installed where QGIS can find it.","Description");
QString sentence3 = tr("Select a GPX input file name, the type of conversion you want to perform, a GPX filename that you want to save the converted file as, and a name for the new layer created from the result.","Description");
QString sentence2 = tr("This requires that you have GPSBabel installed where QGIS can find it.");
QString sentence3 = tr("Select a GPX input file name, the type of conversion you want to perform, a GPX filename that you want to save the converted file as, and a name for the new layer created from the result.");

QString text = format.arg(sentence1).arg(sentence2).arg(sentence3);

Expand Down

0 comments on commit 0f85d10

Please sign in to comment.