Various strings change and capitalisation changes to match the guidelines.

[vlc] / modules / gui / qt4 / ui / sprefs_interface.ui

diff --git a/modules/gui/qt4/ui/sprefs_interface.ui b/modules/gui/qt4/ui/sprefs_interface.ui
index e3966f885710f5a1f36af4ade4fddbc8f8e82b0e..359858086868f71d1a787cdea20822d2f2404fd3 100644 (file)
--- a/modules/gui/qt4/ui/sprefs_interface.ui
+++ b/modules/gui/qt4/ui/sprefs_interface.ui
@@ -5,10 +5,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>445</width>
-    <height>535</height>
+    <width>519</width>
+    <height>633</height>
    </rect>
   </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
@@ -26,32 +32,26 @@
    <item row="1" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
-      <string>_("Default Interface")</string>
+      <string>_("Interface Type")</string>
      </property>
      <layout class="QGridLayout" >
-      <item row="2" column="0" colspan="3" >
-       <widget class="Line" name="line" >
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+      <item row="0" column="0" >
+       <widget class="QRadioButton" name="qt4" >
+        <property name="text" >
+         <string>_("Native")</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1" colspan="2" >
-       <widget class="QLabel" name="skinsLabel" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+      <item row="0" column="1" colspan="3" >
+       <widget class="QLabel" name="defaultLabel" >
         <property name="frameShape" >
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="text" >
-         <string>_("This is VLC's skinnable interface. You can download skins at &lt;a href="http://www.videolan.org/vlc/skins.php">http://www.videolan.org/vlc/skins.php&lt;/a> to customize your player.")</string>
+         <string>_("This is VLC's default interface, with a native look and feel.")</string>
         </property>
-        <property name="alignment" >
-         <set>Qt::AlignBottom|Qt::AlignJustify</set>
+        <property name="textFormat" >
+         <enum>Qt::RichText</enum>
         </property>
         <property name="wordWrap" >
          <bool>true</bool>
@@ -59,65 +59,116 @@
         <property name="margin" >
          <number>10</number>
         </property>
-        <property name="openExternalLinks" >
-         <bool>true</bool>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="QLabel" name="label" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>_("Display mode")</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="2" >
-       <widget class="QPushButton" name="skinBrowse" >
+      <item row="1" column="2" colspan="2" >
+       <widget class="QComboBox" name="displayModeBox" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="3" >
+       <widget class="QCheckBox" name="embedVideo" >
         <property name="text" >
-         <string>_("Browse...")</string>
+         <string>_("Integrate video in interface")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="4" >
+       <widget class="Line" name="line" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
        </widget>
       </item>
       <item row="4" column="0" >
-       <widget class="QLabel" name="label_4" >
+       <widget class="QRadioButton" name="skins" >
         <property name="text" >
-         <string>_("Skin File")</string>
+         <string>_("Skins")</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="1" >
-       <widget class="QLineEdit" name="fileSkin" />
-      </item>
-      <item row="0" column="1" colspan="2" >
-       <widget class="QLabel" name="defaultLabel" >
+      <item rowspan="2" row="4" column="1" colspan="3" >
+       <widget class="QLabel" name="skinsLabel" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="frameShape" >
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="text" >
-         <string>_("This is VLC's default interface, with a native look and feel.")</string>
+         <string>_("This is VLC's skinnable interface. You can download skins at &lt;a href="http://www.videolan.org/vlc/skins.php">http://www.videolan.org/vlc/skins.php&lt;/a> to customize your player.")</string>
         </property>
         <property name="textFormat" >
          <enum>Qt::RichText</enum>
         </property>
+        <property name="scaledContents" >
+         <bool>true</bool>
+        </property>
+        <property name="alignment" >
+         <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+        </property>
         <property name="wordWrap" >
          <bool>true</bool>
         </property>
         <property name="margin" >
-         <number>10</number>
+         <number>0</number>
+        </property>
+        <property name="openExternalLinks" >
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QRadioButton" name="qt4" >
-        <property name="text" >
-         <string>_("Default")</string>
+      <item row="5" column="0" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Vertical</enum>
         </property>
-       </widget>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>20</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
       </item>
-      <item row="3" column="0" >
-       <widget class="QRadioButton" name="skins" >
+      <item row="6" column="0" >
+       <widget class="QLabel" name="label_4" >
         <property name="text" >
-         <string>_("Skins")</string>
+         <string>_("Skin file")</string>
+        </property>
+        <property name="buddy" >
+         <cstring>fileSkin</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" colspan="2" >
-       <widget class="QCheckBox" name="qtAlwaysVideo" >
+      <item row="6" column="1" colspan="2" >
+       <widget class="QLineEdit" name="fileSkin" />
+      </item>
+      <item row="6" column="3" >
+       <widget class="QPushButton" name="skinBrowse" >
         <property name="text" >
-         <string>_("Always display the video")</string>
+         <string>_("Browse...")</string>
         </property>
        </widget>
       </item>
@@ -129,18 +180,38 @@
      <property name="title" >
       <string>_("Instances")</string>
      </property>
-     <layout class="QVBoxLayout" >
-      <item>
+     <layout class="QGridLayout" >
+      <item row="0" column="0" colspan="2" >
        <widget class="QCheckBox" name="OneInterfaceMode" >
         <property name="text" >
          <string>_("Allow only one instance")</string>
         </property>
        </widget>
       </item>
-      <item>
+      <item row="1" column="0" colspan="2" >
        <widget class="QCheckBox" name="EnqueueOneInterfaceMode" >
         <property name="text" >
-         <string>_("Enqueue files in playlist when in one interface mode")</string>
+         <string>_("Enqueue files in playlist when in one instance mode")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="assoName" >
+        <property name="text" >
+         <string>_("File associations:")</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="QPushButton" name="assoButton" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="Maximum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>_("Association Setup")</string>
         </property>
        </widget>
       </item>
@@ -150,7 +221,7 @@
    <item row="3" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox_2" >
      <property name="title" >
-      <string>_("Interface / Network Interaction")</string>
+      <string>_("Privacy / Network Interaction")</string>
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
@@ -160,20 +231,30 @@
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
+      <item row="0" column="1" colspan="2" >
        <widget class="QComboBox" name="artFetcher" />
       </item>
+      <item row="1" column="0" colspan="2" >
+       <widget class="QCheckBox" name="metaFetcher" >
+        <property name="text" >
+         <string>_("Fetch the metadata from the Internet")</string>
+        </property>
+       </widget>
+      </item>
       <item row="2" column="0" >
-       <widget class="QCheckBox" name="qtUpdates" >
+       <widget class="QCheckBox" name="updatesBox" >
         <property name="text" >
          <string>_("Activate update notifier")</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="2" >
-       <widget class="QCheckBox" name="metaFetcher" >
-        <property name="text" >
-         <string>_("Fetch the metadata from Internet")</string>
+      <item row="2" column="2" >
+       <widget class="QSpinBox" name="updatesDays" >
+        <property name="alignment" >
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="suffix" >
+         <string> days</string>
         </property>
        </widget>
       </item>
@@ -185,12 +266,18 @@
  <tabstops>
   <tabstop>language</tabstop>
   <tabstop>qt4</tabstop>
-  <tabstop>qtAlwaysVideo</tabstop>
+  <tabstop>displayModeBox</tabstop>
+  <tabstop>embedVideo</tabstop>
   <tabstop>skins</tabstop>
   <tabstop>fileSkin</tabstop>
   <tabstop>skinBrowse</tabstop>
   <tabstop>OneInterfaceMode</tabstop>
   <tabstop>EnqueueOneInterfaceMode</tabstop>
+  <tabstop>assoButton</tabstop>
+  <tabstop>artFetcher</tabstop>
+  <tabstop>metaFetcher</tabstop>
+  <tabstop>updatesBox</tabstop>
+  <tabstop>updatesDays</tabstop>
  </tabstops>
  <resources/>
  <connections/>