qt4 - some string unifications. Open for comments.. ;)

modules/gui/qt4/ui/sout.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>617</width>
-    <height>678</height>
+    <width>770</width>
+    <height>821</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -533,7 +533,7 @@
        <bool>true</bool>
       </property>
       <attribute name="title" >
-       <string>_("Video Codec")</string>
+       <string>_("Video codec")</string>
       </attribute>
       <layout class="QGridLayout" >
        <item row="0" column="0" >
@@ -622,7 +622,7 @@
      </widget>
      <widget class="QWidget" name="audioCodec" >
       <attribute name="title" >
-       <string>_("Audio Codec")</string>
+       <string>_("Audio codec")</string>
       </attribute>
       <layout class="QGridLayout" >
        <item row="0" column="0" >

modules/gui/qt4/ui/sprefs_audio.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>550</width>
-    <height>725</height>
+    <height>762</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -313,7 +313,7 @@
       <item row="2" column="0" >
        <widget class="QLabel" name="label_5" >
         <property name="text" >
-         <string>_("Visualisation")</string>
+         <string>_("Visualization")</string>
         </property>
        </widget>
       </item>

modules/gui/qt4/ui/sprefs_subtitles.ui

@@ -13,9 +13,6 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
    <property name="spacing" >
     <number>10</number>
    </property>
@@ -25,12 +22,6 @@
       <string>_("On Screen Display")</string>
      </property>
      <layout class="QVBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item>
        <widget class="QCheckBox" name="OSDBox" >
         <property name="text" >
@@ -50,9 +41,7 @@
    <item>
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>5</vsizetype>
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -61,16 +50,10 @@
       <string>_("Subtitles languages")</string>
      </property>
      <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item row="0" column="0" >
        <widget class="QLabel" name="label" >
         <property name="text" >
-         <string>_("Subtitles preferred language")</string>
+         <string>_("Preferred Subtitle language")</string>
         </property>
        </widget>
       </item>
@@ -103,12 +86,6 @@
       <string>_("Display Settings")</string>
      </property>
      <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item row="3" column="1" colspan="2" >
        <widget class="QComboBox" name="effect" />
       </item>
@@ -125,7 +102,7 @@
       <item row="2" column="0" >
        <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>_("Font Color")</string>
+         <string>_("Font color")</string>
         </property>
        </widget>
       </item>

modules/gui/qt4/ui/streampanel.ui

 <ui version="4.0" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
  <class>BroadcastPanel</class>
  <widget class="QWidget" name="BroadcastPanel" >
   <property name="geometry" >
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>627</width>
+    <width>745</width>
     <height>373</height>
    </rect>
   </property>
@@ -16,14 +13,14 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
    <item rowspan="3" row="0" column="0" colspan="3" >
-    <widget class="QTreeWidget" name="inputList" />
+    <widget class="QTreeWidget" name="inputList" >
+     <column>
+      <property name="text" >
+       <string>1</string>
+      </property>
+     </column>
+    </widget>
    </item>
    <item rowspan="2" row="2" column="3" >
     <widget class="QGroupBox" name="statsBox" >
@@ -38,12 +35,6 @@
       <string>Stuff</string>
      </property>
      <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item>
        <widget class="QPushButton" name="deleteButton" >
         <property name="text" >
@@ -67,12 +58,6 @@
       <string>_("Control")</string>
      </property>
      <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item row="0" column="0" >
        <widget class="QRadioButton" name="manualRadio" >
         <property name="text" >
@@ -103,12 +88,6 @@
       <string>_("Status")</string>
      </property>
      <layout class="QHBoxLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
       <item>
        <widget class="QPushButton" name="playPauseButton" >
         <property name="text" >
@@ -150,27 +129,26 @@
    <item row="3" column="0" >
     <widget class="QPushButton" name="addInputButton" >
      <property name="text" >
-      <string>_("Add input")</string>
+      <string>_("Add Input")</string>
      </property>
     </widget>
    </item>
    <item row="3" column="1" >
     <widget class="QPushButton" name="editInputButton" >
      <property name="text" >
-      <string>_("Edit input")</string>
+      <string>_("Edit Input")</string>
      </property>
     </widget>
    </item>
    <item row="3" column="2" >
     <widget class="QPushButton" name="clearInputsButton" >
      <property name="text" >
-      <string>_("Clear list")</string>
+      <string>_("Clear List")</string>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
- <pixmapfunction></pixmapfunction>
  <resources/>
  <connections/>
 </ui>

modules/gui/qt4/ui/video_effects.ui

@@ -5,12 +5,12 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>472</width>
+    <width>517</width>
     <height>320</height>
    </rect>
   </property>
   <property name="currentIndex" >
-   <number>1</number>
+   <number>5</number>
   </property>
   <widget class="QWidget" name="tab" >
    <attribute name="title" >
@@ -29,7 +29,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="0" column="0" >
+       <item row="0" column="0" >
         <widget class="QComboBox" name="transformTypeCombo" />
        </item>
       </layout>
@@ -47,7 +47,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="0" column="0" >
+       <item row="0" column="0" >
         <widget class="QLabel" name="label_29" >
          <property name="text" >
           <string>_("Sigma")</string>
@@ -226,7 +226,7 @@
     <string>_("Color fun")</string>
    </attribute>
    <layout class="QGridLayout" >
-   <item row="1" column="1" >
+    <item row="1" column="1" >
      <widget class="QGroupBox" name="extractEnable" >
       <property name="title" >
        <string>_("Color extraction")</string>
@@ -238,7 +238,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="0" column="0" >
+       <item row="0" column="0" >
         <widget class="QLabel" name="label_6" >
          <property name="text" >
           <string>_("Color")</string>
@@ -258,7 +258,7 @@
     <item row="0" column="1" >
      <widget class="QCheckBox" name="invertEnable" >
       <property name="text" >
-       <string>_("Color invert")</string>
+       <string>_("Invert colors")</string>
       </property>
      </widget>
     </item>
@@ -274,7 +274,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="2" column="0" >
+       <item row="2" column="0" >
         <widget class="QLabel" name="label_14" >
          <property name="text" >
           <string>_("Similarity")</string>
@@ -326,7 +326,7 @@
     <string>_("Some random name")</string>
    </attribute>
    <layout class="QGridLayout" >
-   <item row="1" column="0" >
+    <item row="1" column="0" >
      <widget class="QCheckBox" name="magnifyEnable" >
       <property name="text" >
        <string>_("Magnification")</string>
@@ -345,7 +345,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="0" column="1" >
+       <item row="0" column="1" >
         <widget class="QDial" name="rotateAngleDial" >
          <property name="maximum" >
           <number>359</number>
@@ -389,7 +389,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="0" column="1" >
+       <item row="0" column="1" >
         <widget class="QSpinBox" name="puzzleRowsSpin" >
          <property name="minimum" >
           <number>1</number>
@@ -440,7 +440,7 @@
     <string>_("Image modification")</string>
    </attribute>
    <layout class="QGridLayout" >
-   <item row="2" column="0" >
+    <item row="2" column="0" >
      <widget class="QCheckBox" name="waveEnable" >
       <property name="text" >
        <string>_("Waves")</string>
@@ -487,7 +487,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="0" column="0" >
+       <item row="0" column="0" >
         <widget class="QLabel" name="label_25" >
          <property name="text" >
           <string>_("Factor")</string>
@@ -531,7 +531,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="0" column="0" >
+       <item row="0" column="0" >
         <widget class="QLabel" name="label_18" >
          <property name="text" >
           <string>_("Mode")</string>
@@ -565,7 +565,7 @@
     <string>_("Find a name")</string>
    </attribute>
    <layout class="QGridLayout" >
-   <item rowspan="2" row="0" column="1" >
+    <item rowspan="2" row="0" column="1" >
      <widget class="QGroupBox" name="eraseEnable" >
       <property name="title" >
        <string>_("Logo erase")</string>
@@ -577,7 +577,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="1" column="0" >
+       <item row="1" column="0" >
         <widget class="QLabel" name="label_16" >
          <property name="text" >
           <string>_("Top")</string>
@@ -622,7 +622,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="0" column="0" >
+       <item row="0" column="0" >
         <widget class="QLabel" name="label_9" >
          <property name="text" >
           <string>_("Number of clones")</string>
@@ -654,7 +654,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="0" column="0" >
+       <item row="0" column="0" >
         <widget class="QLabel" name="label_31" >
          <property name="text" >
           <string>_("Rows")</string>
@@ -698,7 +698,7 @@
     <string>_("Overlay")</string>
    </attribute>
    <layout class="QGridLayout" >
-   <item row="0" column="0" >
+    <item row="0" column="0" >
      <widget class="QGroupBox" name="marqEnable" >
       <property name="title" >
        <string>_("Add text")</string>
@@ -710,7 +710,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="1" column="0" >
+       <item row="1" column="0" >
         <widget class="QLabel" name="label_24" >
          <property name="text" >
           <string>_("Position")</string>
@@ -745,7 +745,7 @@
        <bool>false</bool>
       </property>
       <layout class="QGridLayout" >
-      <item row="3" column="0" >
+       <item row="3" column="0" >
         <widget class="QLabel" name="label_22" >
          <property name="text" >
           <string>_("Transparency")</string>
@@ -808,7 +808,7 @@
     <string>_("Advanced video filter controls")</string>
    </attribute>
    <layout class="QGridLayout" >
-   <item row="2" column="1" colspan="2" >
+    <item row="2" column="1" colspan="2" >
      <widget class="QLineEdit" name="subpictureFilterText" />
     </item>
     <item row="2" column="0" >