r21034 by jghali -

[scribus-commit]

Author: jghali
Date: Wed Feb 24 22:57:02 2016
New Revision: 21034

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21034
Log:
#13769: Simplify Group Palette strings translation <FirasH>

Modified:
    trunk/Scribus/scribus/ui/propertiespalette_group.cpp
    trunk/Scribus/scribus/ui/propertiespalette_groupbase.ui

Modified: trunk/Scribus/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21034&path=/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_group.cpp	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_group.cpp	Wed Feb 24 22:57:02 2016
@@ -630,24 +630,7 @@
 
 void PropertiesPalette_Group::languageChange()
 {
-	editShape->setText( tr("&Edit..."));
-	shapeGroup->setTitle( tr("Shape"));
-
-	textFlowGroup->setTitle( tr("Text &Flow Around Frame"));
-	textFlowDisabled->setText( tr("Disabled"));
-	textFlowUsesFrameShape->setText( tr("Use Frame &Shape"));
-	textFlowUsesBoundingBox->setText( tr("Use &Bounding Box"));
-	textFlowUsesContourLine->setText( tr("&Use Contour Line"));
-	textFlowUsesImageClipping->setText( tr("Use Image Clip Path"));
-
-	textFlowDisabled->setToolTip( tr("Disable text flow from lower frames around object"));
-	textFlowUsesFrameShape->setToolTip( tr("Use the frame shape for text flow of text frames below the object"));
-	textFlowUsesBoundingBox->setToolTip(  "<qt>" + tr("Use the bounding box, which is always rectangular, instead of the frame's shape for text flow of text frames below the object") + "</qt>" );
-	textFlowUsesContourLine->setToolTip(  "<qt>" + tr("When chosen, the contour line can be edited with the Edit Shape Tool on the palette further above. When edited via the shape palette, this becomes a second separate line originally based on the frame's shape for text flow of text frames below the object.") + "</qt>" );
-	textFlowUsesImageClipping->setToolTip(  "<qt>" + tr("Use the clipping path of the image") + "</qt>" );
-
-	evenOdd->setToolTip( "<qt>" + tr("Any path self-intersections or subpaths create holes in the fill")  + "</qt>");
-	nonZero->setToolTip( "<qt>" + tr("Fill is solid unless a subpath is counter-directional")  + "</qt>");
+	retranslateUi(this);
 }
 
 void PropertiesPalette_Group::unitChange()

Modified: trunk/Scribus/scribus/ui/propertiespalette_groupbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21034&path=/trunk/Scribus/scribus/ui/propertiespalette_groupbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_groupbase.ui	(original)
+++ trunk/Scribus/scribus/ui/propertiespalette_groupbase.ui	Wed Feb 24 22:57:02 2016
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <property name="spacing">
@@ -90,7 +90,7 @@
    <item>
     <widget class="QGroupBox" name="textFlowGroup">
      <property name="title">
-      <string>Text Flow Around Frame</string>
+      <string>Text &Flow Around Frame</string>
      </property>
      <property name="flat">
       <bool>true</bool>
@@ -118,6 +118,9 @@
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Disable text flow from lower frames around object</string>
         </property>
         <property name="text">
          <string>Disabled</string>
@@ -144,8 +147,11 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text">
-         <string>Use &Frame Shape</string>
+        <property name="toolTip">
+         <string>Use the frame shape for text flow of text frames below the object</string>
+        </property>
+        <property name="text">
+         <string>Use Frame &Shape</string>
         </property>
         <property name="checkable">
          <bool>true</bool>
@@ -169,6 +175,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="toolTip">
+         <string><qt>Use the bounding box, which is always rectangular, instead of the frame's shape for text flow of text frames below the object</qt></string>
+        </property>
         <property name="text">
          <string>Use &Bounding Box</string>
         </property>
@@ -194,6 +203,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="toolTip">
+         <string><qt>When chosen, the contour line can be edited with the Edit Shape Tool on the palette further above. When edited via the shape palette, this becomes a second separate line originally based on the frame's shape for text flow of text frames below the object.</qt></string>
+        </property>
         <property name="text">
          <string>&Use Contour Line</string>
         </property>
@@ -218,6 +230,9 @@
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string><qt>Use the clipping path of the image</qt></string>
         </property>
         <property name="text">
          <string>Use Image Clip Path</string>
@@ -284,6 +299,9 @@
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
+        <property name="toolTip">
+         <string><qt>Any path self-intersections or subpaths create holes in the fill</qt></string>
+        </property>
         <property name="text">
          <string>Even-Odd</string>
         </property>
@@ -296,6 +314,9 @@
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string><qt>Fill is solid unless a subpath is counter-directional</qt></string>
         </property>
         <property name="text">
          <string>Non Zero</string>