r21050 by jghali -

[scribus-commit]

Author: jghali
Date: Thu Mar  3 23:31:08 2016
New Revision: 21050

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21050
Log:
#13782: Simplify Arrange Pages Palette strings translation <FirasH>

Modified:
    trunk/Scribus/scribus/ui/pagepalette_pages.cpp
    trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui

Modified: trunk/Scribus/scribus/ui/pagepalette_pages.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21050&path=/trunk/Scribus/scribus/ui/pagepalette_pages.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pages.cpp	(original)
+++ trunk/Scribus/scribus/ui/pagepalette_pages.cpp	Thu Mar  3 23:31:08 2016
@@ -398,11 +398,5 @@
 
 void PagePalette_Pages::languageChange()
 {
-	setWindowTitle( tr( "Arrange Pages" ) );
-	textLabel1->setText( tr( "Available Master Pages:" ) );
-	textLabel2->setText( tr( "Document Pages:" ) );
-	
-	masterPageList->setToolTip( "<qt>" + tr( "List of master pages in the document. Master page names may be dragged onto the page view below to apply master pages, or onto the empty space between pages to create new pages." ) + "</qt>");
-	pageView->setToolTip( "<qt>" + tr( "List of normal pages in the document, shown with the document layout. Pages may be dragged to rearrange or delete them.")  + "</qt>");
-	trash->setToolTip( "<qt>" + tr("Drag pages or master pages onto the trash to delete them") + "</qt>");
-}
+	retranslateUi(this);
+}

Modified: trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21050&path=/trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui
==============================================================================
--- trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui	(original)
+++ trunk/Scribus/scribus/ui/pagepalette_pagesbase.ui	Thu Mar  3 23:31:08 2016
@@ -11,13 +11,22 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string>Arrange Pages</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>5</number>
    </property>
-   <property name="margin">
+   <property name="leftMargin">
+    <number>5</number>
+   </property>
+   <property name="topMargin">
+    <number>5</number>
+   </property>
+   <property name="rightMargin">
+    <number>5</number>
+   </property>
+   <property name="bottomMargin">
     <number>5</number>
    </property>
    <item>
@@ -30,11 +39,20 @@
        <property name="spacing">
         <number>5</number>
        </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="textLabel1">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="masterPageLabel">
          <property name="text">
           <string>Available Master Pages:</string>
          </property>
@@ -47,6 +65,9 @@
            <width>130</width>
            <height>70</height>
           </size>
+         </property>
+         <property name="toolTip">
+          <string><qt>List of master pages in the document. Master page names may be dragged onto the page view below to apply master pages, or onto the empty space between pages to create new pages.</qt></string>
          </property>
          <property name="iconSize">
           <size>
@@ -63,11 +84,20 @@
        <property name="spacing">
         <number>5</number>
        </property>
-       <property name="margin">
-        <number>0</number>
-       </property>
-       <item>
-        <widget class="QLabel" name="textLabel2">
+       <property name="leftMargin">
+        <number>0</number>
+       </property>
+       <property name="topMargin">
+        <number>0</number>
+       </property>
+       <property name="rightMargin">
+        <number>0</number>
+       </property>
+       <property name="bottomMargin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLabel" name="pageViewLabel">
          <property name="text">
           <string>Document Pages:</string>
          </property>
@@ -80,6 +110,9 @@
            <width>130</width>
            <height>120</height>
           </size>
+         </property>
+         <property name="toolTip">
+          <string><qt>List of normal pages in the document, shown with the document layout. Pages may be dragged to rearrange or delete them.</qt></string>
          </property>
          <property name="selectionMode">
           <enum>QAbstractItemView::NoSelection</enum>
@@ -133,6 +166,9 @@
          <height>32</height>
         </size>
        </property>
+       <property name="toolTip">
+        <string><qt>Drag pages or master pages onto the trash to delete them</qt></string>
+       </property>
        <property name="text">
         <string/>
        </property>