Add some tr()'s to user visible text

g_j_m · g_j_m · commit 263e6c0b85d2 · 2006-10-21T06:42:23.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@5984 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/composer/qgscomposer.cpp b/src/composer/qgscomposer.cpp
@@ -46,7 +46,7 @@ QgsComposer::QgsComposer( QgisApp *qgis): QMainWindow()
 {
   setupUi(this);
   setupTheme();
-  setWindowTitle("QGIS - print composer");
+  setWindowTitle(tr("QGIS - print composer"));
 
   // Template save and load is not yet implemented, so disable those actions
   mActionOpenTemplate->setEnabled(false);
@@ -68,7 +68,7 @@ QgsComposer::QgsComposer( QgisApp *qgis): QMainWindow()
   mCompositionOptionsLayout = new QGridLayout( mCompositionOptionsFrame, 1, 1 );
   mItemOptionsLayout = new QGridLayout( mItemOptionsFrame, 1, 1 );
 
-  mCompositionNameComboBox->insertItem( "Map 1" );
+  mCompositionNameComboBox->insertItem( tr("Map 1") );
 
   mComposition  = new QgsComposition( this, 1 );
   mComposition->setActive ( true );
@@ -415,7 +415,7 @@ void QgsComposer::on_mActionPrint_activated(void)
       // Overwrite translate
       if ( mPrinter->orientation() == QPrinter::Portrait ) { 
         if (!f.open( QIODevice::ReadWrite )) {
-          throw QgsIOException(tr("Couldn't open " + f.name() + tr(" for read/write")));
+          throw QgsIOException(tr("Couldn't open ") + f.name() + tr(" for read/write"));
         }
         offset = 0;
         found = false;
@@ -554,7 +554,7 @@ void QgsComposer::on_mActionExportAsImage_activated(void)
   for ( ; myCounterInt < QImageWriter::supportedImageFormats().count(); myCounterInt++ )
   {
     QString myFormat=QString(QImageWriter::supportedImageFormats().at( myCounterInt ));
-    QString myFilter = myFormat + " format (*." + myFormat.lower() + " *." + myFormat.upper() + ")";
+    QString myFilter = myFormat + " " + tr("format") + " (*." + myFormat.lower() + " *." + myFormat.upper() + ")";
     if ( myCounterInt > 0 ) myFilters += ";;";
     myFilters += myFilter;
     myFilterMap[myFilter] = myFormat;
@@ -670,7 +670,7 @@ void QgsComposer::on_mActionExportAsSVG_activated(void)
   QFileInfo file(myLastUsedFile);
 
   QFileDialog *myQFileDialog = new QFileDialog( this, tr("Choose a filename to save the map as"),
-                                                file.path(), "SVG Format (*.svg *SVG)" );
+                                                file.path(), tr("SVG Format") + " (*.svg *SVG)" );
   
   myQFileDialog->selectFile( file.fileName() );
   myQFileDialog->setMode(QFileDialog::AnyFile);
diff --git a/src/composer/qgscomposerpicture.cpp b/src/composer/qgscomposerpicture.cpp
@@ -483,7 +483,7 @@ QWidget *QgsComposerPicture::options ( void )
 
 QString QgsComposerPicture::pictureDialog ( void )
 {
-    QString filters = "Pictures ( *.svg *.SVG ";
+    QString filters = tr("Pictures") + " ( *.svg *.SVG ";
     QList<QByteArray> formats = QImageWriter::supportedImageFormats();
 
     for ( int i = 0; i < formats.count(); i++ )
diff --git a/src/composer/qgscomposervectorlegend.cpp b/src/composer/qgscomposervectorlegend.cpp
@@ -95,7 +95,7 @@ void QgsComposerVectorLegend::init ( void )
 {
     mSelected = false;
     mNumCachedLayers = 0;
-    mTitle = "Legend";
+    mTitle = tr("Legend");
     mMap = 0;
     mNextLayerGroup = 1;
     mFrame = true;

Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ QWidget *QgsComposerPicture::options ( void )`
`483`	`483`
`484`	`484`	`QString QgsComposerPicture::pictureDialog ( void )`
`485`	`485`	`{`
`486`		`- QString filters = "Pictures ( .svg .SVG ";`
	`486`	`+ QString filters = tr("Pictures") + " ( .svg .SVG ";`
`487`	`487`	`QList<QByteArray> formats = QImageWriter::supportedImageFormats();`
`488`	`488`
`489`	`489`	`for ( int i = 0; i < formats.count(); i++ )`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ void QgsComposerVectorLegend::init ( void )`
`95`	`95`	`{`
`96`	`96`	`mSelected = false;`
`97`	`97`	`mNumCachedLayers = 0;`
`98`		`- mTitle = "Legend";`
	`98`	`+ mTitle = tr("Legend");`
`99`	`99`	`mMap = 0;`
`100`	`100`	`mNextLayerGroup = 1;`
`101`	`101`	`mFrame = true;`