tdf#97192 “Capacity” is a weird term for “size”

Also, rename “size” to “dimensions” so as to avoid repetition.

Change-Id: Ide933e7ccd0cb50be56573ef96afad0b858413cf

1 files changed, 106 insertions, 93 deletions

diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui b/svx/uiconfig/ui/compressgraphicdialog.ui
index fc973328a81b..2c812eb6a2df 100644
--- a/svx/uiconfig/ui/compressgraphicdialog.ui
+++ b/svx/uiconfig/ui/compressgraphicdialog.ui
@@ -155,7 +155,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
+                            <property name="top_attach">3</property>
                             <property name="width">3</property>
                           </packing>
                         </child>
@@ -170,27 +170,11 @@
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
+                            <property name="top_attach">6</property>
                             <property name="width">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="label3">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="margin_left">12</property>
-                            <property name="xalign">1</property>
-                            <property name="label" translatable="yes">Width:</property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">spin-new-width</property>
-                            <property name="width_chars">15</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">5</property>
-                          </packing>
-                        </child>
-                        <child>
                           <object class="GtkSpinButton" id="spin-new-width">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
@@ -199,7 +183,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">5</property>
+                            <property name="top_attach">7</property>
                           </packing>
                         </child>
                         <child>
@@ -207,15 +191,15 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">Height:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">spin-new-height</property>
-                            <property name="width_chars">15</property>
+                            <property name="width_chars">14</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">6</property>
+                            <property name="top_attach">8</property>
                           </packing>
                         </child>
                         <child>
@@ -239,15 +223,15 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">Resolution:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">combo-resolution</property>
-                            <property name="width_chars">15</property>
+                            <property name="width_chars">14</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">7</property>
+                            <property name="top_attach">9</property>
                           </packing>
                         </child>
                         <child>
@@ -259,7 +243,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">6</property>
+                            <property name="top_attach">8</property>
                           </packing>
                         </child>
                         <child>
@@ -285,7 +269,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">7</property>
+                            <property name="top_attach">9</property>
                           </packing>
                         </child>
                         <child>
@@ -293,10 +277,10 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">Quality:</property>
                             <property name="use_underline">True</property>
-                            <property name="width_chars">15</property>
+                            <property name="width_chars">14</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -308,14 +292,14 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">Compression:</property>
                             <property name="use_underline">True</property>
-                            <property name="width_chars">15</property>
+                            <property name="width_chars">14</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
+                            <property name="top_attach">4</property>
                           </packing>
                         </child>
                         <child>
@@ -323,15 +307,15 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_left">12</property>
-                            <property name="xalign">1</property>
                             <property name="label" translatable="yes">Interpolation:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">interpolation-method-combo</property>
-                            <property name="width_chars">15</property>
+                            <property name="width_chars">14</property>
+                            <property name="xalign">1</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">8</property>
+                            <property name="top_attach">10</property>
                           </packing>
                         </child>
                         <child>
@@ -342,43 +326,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">8</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label13">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">px</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">5</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label14">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">px</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">6</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label16">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">DPI</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">7</property>
+                            <property name="top_attach">10</property>
                           </packing>
                         </child>
                         <child>
@@ -391,7 +339,7 @@
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
+                            <property name="top_attach">4</property>
                           </packing>
                         </child>
                         <child>
@@ -421,8 +369,8 @@
                             <property name="value_pos">right</property>
                           </object>
                           <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">1</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                         <child>
@@ -438,13 +386,83 @@
                             <property name="value_pos">right</property>
                           </object>
                           <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">5</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label16">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">DPI</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
                             <property name="left_attach">2</property>
-                            <property name="top_attach">3</property>
+                            <property name="top_attach">9</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label14">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">px</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">8</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label13">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">px</property>
+                            <property name="xalign">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">7</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="margin_left">12</property>
+                            <property name="label" translatable="yes">Width:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">spin-new-width</property>
+                            <property name="width_chars">14</property>
+                            <property name="xalign">1</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">7</property>
                           </packing>
                         </child>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -484,15 +502,14 @@
                         <property name="can_focus">False</property>
                         <property name="valign">start</property>
                         <property name="row_spacing">6</property>
-                        <property name="column_spacing">12</property>
+                        <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Original size:</property>
-                            <property name="width_chars">15</property>
+                            <property name="label" translatable="yes">Actual dimensions:</property>
                             <property name="single_line_mode">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -504,8 +521,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="xalign">0</property>
                             <property name="label">???</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -516,9 +533,8 @@
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Apparent dimensions:</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">View size:</property>
-                            <property name="width_chars">15</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -529,9 +545,8 @@
                           <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Image size:</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Image capacity:</property>
-                            <property name="width_chars">15</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -542,9 +557,8 @@
                           <object class="GtkLabel" id="label10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">New size:</property>
                             <property name="xalign">0</property>
-                            <property name="label" translatable="yes">New capacity:</property>
-                            <property name="width_chars">15</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -556,8 +570,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="xalign">0</property>
                             <property name="label">???</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -569,8 +583,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="xalign">0</property>
                             <property name="label">???</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -582,8 +596,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="xalign">0</property>
                             <property name="label">???</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -607,10 +621,9 @@
                           <object class="GtkLabel" id="label15">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes">Type:</property>
-                            <property name="width_chars">15</property>
                             <property name="single_line_mode">True</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -622,8 +635,8 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
-                            <property name="xalign">0</property>
                             <property name="label">???</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>