[Marble-commits] KDE/kdeedu/marble/src/lib

Andrew Coles andrew.i.coles at googlemail.com
Wed Jan 19 13:53:01 CET 2011


SVN commit 1215730 by coles:

Proof-reading strings in the Map Wizard.  The term bitmap is not likely to be
widely understood, though is necessary in this context to distinguish from
vector images.  As a compromise, following a discussion on IRC, have gone
for 'bitmap image'.

Other minor changes:

* harddisc -> disk
* worldmap -> world map
* can't -> cannot.  See the note on contractions in the HIG:

  http://techbase.kde.org/Projects/Usability/HIG/Contractions



 M  +1 -1      MapWizard.cpp  
 M  +3 -3      MapWizard.ui  


--- trunk/KDE/kdeedu/marble/src/lib/MapWizard.cpp #1215729:1215730
@@ -168,7 +168,7 @@
     QDomDocument xml;
     if( !xml.setContent( result ) )
     {
-        QMessageBox::critical( this, tr( "Error while parsing" ), tr( "Wizard can't parse server's response" ) );
+        QMessageBox::critical( this, tr( "Error while parsing" ), tr( "Wizard cannot parse server's response" ) );
         return;
     }
 
--- trunk/KDE/kdeedu/marble/src/lib/MapWizard.ui #1215729:1215730
@@ -67,10 +67,10 @@
     <item row="2" column="1">
      <widget class="QRadioButton" name="radioButtonBitmap">
       <property name="toolTip">
-       <string>You need to provide a bitmap of a worldmap that is stored on your harddisc.</string>
+       <string>You need to provide a bitmap image of a world map that is stored on disk.</string>
       </property>
       <property name="text">
-       <string>A bitmap of the whole world stored locally</string>
+       <string>A bitmap image of the whole world stored locally</string>
       </property>
      </widget>
     </item>
@@ -194,7 +194,7 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Worldmap Bitmap&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;World Map Bitmap Image&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Please choose the location of a world map that is stored in a single image file (JPG, PNG, etc.). It needs to be provided in &lt;a href=&quot;http://en.wikipedia.org/wiki/Equirectangular_projection&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;Equirectangular projection&lt;/span&gt;&lt;/a&gt;, so the shape should look like this (size ratio: 2:1):&lt;/p&gt;
 &lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/data/svg/worldmap.svg&quot; width=&quot;150&quot; /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>


More information about the Marble-commits mailing list