Translation fixes

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7985 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 16, 2008 · 0302dfc · 0302dfc
1 parent f5afee3
commit 0302dfc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp b/src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
@@ -56,12 +56,19 @@ QgsDelimitedTextPluginGui::QgsDelimitedTextPluginGui(QgisInterface * _qI, QWidge
     delimiterRegexp->setChecked(true);
   }
 
-  teInstructions->setHtml(tr("<h2>Description</h2>"
-"<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>"
-"<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>"));
-  // Force a slightly smaller height for the text sample display. Trying to
-  // this in the .ui file never seems to achieve what it required, hence it's
-  // done here.
+  QString format = QString("<h2>%1</h2><p>%2</p><p>%3</p>");
+  QString header = tr("Description");
+  QString paragraph1 = tr("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!");
+  QString paragraph2 = tr("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.");
+  teInstructions->setHtml(format.arg(header)
+			  .arg(paragraph1)
+			  .arg(paragraph2));
+
   txtSample->setFixedHeight(120);
 }  
 QgsDelimitedTextPluginGui::~QgsDelimitedTextPluginGui()

diff --git a/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui b/src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui
@@ -49,10 +49,7 @@
       <bool>true</bool>
      </property>
      <property name="html" >
-      <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">
-&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>
+      <string></string>
      </property>
     </widget>
    </item>

diff --git a/src/plugins/gps_importer/qgsgpsplugingui.cpp b/src/plugins/gps_importer/qgsgpsplugingui.cpp
@@ -405,8 +405,8 @@ void QgsGPSPluginGui::populateIMPBabelFormats() {
 }
 
 void QgsGPSPluginGui::populateCONVDialog() {
-  cmbCONVType->insertItem(tr("Route -> Waypoint"));
-  cmbCONVType->insertItem(tr("Waypoint -> Route"));
+  cmbCONVType->insertItem(tr("Routes") + " -> " + tr("Waypoints"));
+  cmbCONVType->insertItem(tr("Waypoints") + " -> " + tr("Routes"));
 
   QString format = QString("<html><body><p>%1 %2<p>%3</body></html>");