Skip to content

Commit 764ee5d

Browse files
author
homann
committedJan 16, 2008
Translation fixes
git-svn-id: http://svn.osgeo.org/qgis/trunk@7985 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3b8ce29 commit 764ee5d

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed
 

‎src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,19 @@ QgsDelimitedTextPluginGui::QgsDelimitedTextPluginGui(QgisInterface * _qI, QWidge
5656
delimiterRegexp->setChecked(true);
5757
}
5858

59-
teInstructions->setHtml(tr("<h2>Description</h2>"
60-
"<p>Select a delimited text file containing a header row and one or more rows of x and y coordinates that you would like to use as a point layer and this plugin will do the job for you!</p>"
61-
"<p>Use the layer name box to specify the legend name for the new layer. Use the delimiter box to specify what delimeter is used in your file (e.g. space, comma, tab or a regular expression in Perl style). After choosing a delimiter, press the parse button and select the columns containing the x and y values for the layer.</p>"));
62-
// Force a slightly smaller height for the text sample display. Trying to
63-
// this in the .ui file never seems to achieve what it required, hence it's
64-
// done here.
59+
QString format = QString("<h2>%1</h2><p>%2</p><p>%3</p>");
60+
QString header = tr("Description");
61+
QString paragraph1 = tr("Select a delimited text file containing a header row"
62+
" and one or more rows of x and y coordinates that you"
63+
" would like to use as a point layer and this plugin will do the job for you!");
64+
QString paragraph2 = tr("Use the layer name box to specify the legend name for the new layer."
65+
" Use the delimiter box to specify what delimeter is used in your file (e.g. space,"
66+
" comma, tab or a regular expression in Perl style). After choosing a delimiter,"
67+
" press the parse button and select the columns containing the x and y values for the layer.");
68+
teInstructions->setHtml(format.arg(header)
69+
.arg(paragraph1)
70+
.arg(paragraph2));
71+
6572
txtSample->setFixedHeight(120);
6673
}
6774
QgsDelimitedTextPluginGui::~QgsDelimitedTextPluginGui()

‎src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@
4949
<bool>true</bool>
5050
</property>
5151
<property name="html" >
52-
<string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
53-
p, li { white-space: pre-wrap; }
54-
&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
55-
&lt;p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;/p>&lt;/body>&lt;/html></string>
52+
<string></string>
5653
</property>
5754
</widget>
5855
</item>

‎src/plugins/gps_importer/qgsgpsplugingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ void QgsGPSPluginGui::populateIMPBabelFormats() {
405405
}
406406

407407
void QgsGPSPluginGui::populateCONVDialog() {
408-
cmbCONVType->insertItem(tr("Route -> Waypoint"));
409-
cmbCONVType->insertItem(tr("Waypoint -> Route"));
408+
cmbCONVType->insertItem(tr("Routes") + " -> " + tr("Waypoints"));
409+
cmbCONVType->insertItem(tr("Waypoints") + " -> " + tr("Routes"));
410410

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

0 commit comments

Comments
 (0)