r17581 by craig - #9494: Fix some non-translatable strings in styles

[scribus-commit]

Author: craig
Date: Mon Jun 18 20:26:42 2012
New Revision: 17581

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17581
Log:
#9494: Fix some non-translatable strings in styles

Modified:
    trunk/Scribus/scribus/ui/smpstylewidget.cpp
    trunk/Scribus/scribus/ui/smpstylewidget.ui

Modified: trunk/Scribus/scribus/ui/smpstylewidget.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17581&path=/trunk/Scribus/scribus/ui/smpstylewidget.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.cpp (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.cpp Mon Jun 18 20:26:42 2012
@@ -134,6 +134,9 @@
 //	optMarginCombo->addItem(tr("Default"), ParagraphStyle::OM_Default);
 //
 //	optMarginLabel->setText(tr("Optical Margins:"));
+
+	dropCapsLineLabel->setText( tr("Lines:"));
+	distFromTextLabel->setText( tr("Distance from Text:"));
 	lineSpacing_->setSuffix(unitGetSuffixFromIndex(0));
 	spaceAbove_->setSuffix(unitGetSuffixFromIndex(0));
 	spaceBelow_->setSuffix(unitGetSuffixFromIndex(0));
@@ -144,17 +147,20 @@
 	tabWidget->setTabText(0, tr("Properties"));
 	tabWidget->setTabText(1, tr("Character Style"));
 	
-	minSpaceLabel->setText(tr("Min. Space Width:"));
-	glyphExtensionLabel->setText(tr("Glyph Extension"));
-	minGlyphExtLabel->setText(tr("Min:", "Glyph Extension"));
-	maxGlyphExtLabel->setText(tr("Max:", "Glyph Extension"));
-
-	keepLabelStart->setText (tr ("Don't separate first"));
-	keepLabelEnd->setText (tr ("Don't separate last"));
-	keepLinesStart->setSuffix (tr (" lines"));
-	keepLinesEnd->setSuffix (tr (" lines"));
-	keepTogether->setText (tr ("Do not split paragraph"));
-	keepWithNext->setText (tr ("Keep with next paragraph"));
+	advSettingsGroupBox->setTitle( tr("Advanced Settings"));
+	minSpaceLabel->setText( tr("Min. Space Width:"));
+	glyphExtensionLabel->setText( tr("Glyph Extension"));
+	minGlyphExtLabel->setText( tr("Min:", "Glyph Extension"));
+	maxGlyphExtLabel->setText (tr("Max:", "Glyph Extension"));
+
+	opticalMarginsGroupBox->setTitle( tr("Optical Margins"));
+	optMarginRadioNone->setText( tr("None","optical margins") );
+	optMarginRadioBoth->setText( tr("Both Sides","optical margins") );
+	optMarginRadioLeft->setText( tr("Left Only","optical margins") );
+	optMarginRadioRight->setText( tr("Right Only","optical margins") );
+
+	optMarginDefaultButton->setText( tr("Reset to Default") );
+	optMarginParentButton->setText( tr("Use Parent Value") );
 }
 
 void SMPStyleWidget::unitChange(double oldRatio, double newRatio, int unitIndex)

Modified: trunk/Scribus/scribus/ui/smpstylewidget.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17581&path=/trunk/Scribus/scribus/ui/smpstylewidget.ui
==============================================================================
--- trunk/Scribus/scribus/ui/smpstylewidget.ui (original)
+++ trunk/Scribus/scribus/ui/smpstylewidget.ui Mon Jun 18 20:26:42 2012
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>714</width>
-    <height>599</height>
+    <width>792</width>
+    <height>717</height>
    </rect>
   </property>
   <layout class="QVBoxLayout">
@@ -25,9 +25,6 @@
         <layout class="QHBoxLayout">
          <property name="spacing">
           <number>5</number>
-         </property>
-         <property name="margin">
-          <number>0</number>
          </property>
          <item>
           <widget class="QLabel" name="parentLabel">
@@ -257,7 +254,7 @@
               <item>
                <layout class="QHBoxLayout">
                 <item>
-                 <widget class="QLabel" name="label">
+                 <widget class="QLabel" name="dropCapsLineLabel">
                   <property name="text">
                    <string>&Lines:</string>
                   </property>
@@ -290,7 +287,7 @@
                  </spacer>
                 </item>
                 <item>
-                 <widget class="QLabel" name="label_2">
+                 <widget class="QLabel" name="distFromTextLabel">
                   <property name="text">
                    <string>Distance from Text:</string>
                   </property>
@@ -428,7 +425,7 @@
          <item>
           <layout class="QVBoxLayout" name="verticalLayout_3">
            <item>
-            <widget class="QGroupBox" name="groupBox">
+            <widget class="QGroupBox" name="opticalMarginsGroupBox">
              <property name="font">
               <font>
                <weight>50</weight>
@@ -495,7 +492,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QGroupBox" name="groupBox_2">
+            <widget class="QGroupBox" name="advSettingsGroupBox">
              <property name="enabled">
               <bool>true</bool>
              </property>