sw/uiconfig/swriter/ui/mailmerge.ui |  383 +++++++++++++++++-------------------
 1 file changed, 190 insertions(+), 193 deletions(-)

New commits:
commit 2486eaf671f38ada76c500116ee061e9d8240f4d
Author:     Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Dec 14 11:29:39 2023 +0100
Commit:     Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Thu Dec 14 16:06:02 2023 +0100

    Save with newer Glade
    
    Change-Id: Id506e00f737b72f40448aacb6c23e64c09a0670d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160763
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>

diff --git a/sw/uiconfig/swriter/ui/mailmerge.ui 
b/sw/uiconfig/swriter/ui/mailmerge.ui
index 58b3fb7b8b89..f81e6f052d9a 100644
--- a/sw/uiconfig/swriter/ui/mailmerge.ui
+++ b/sw/uiconfig/swriter/ui/mailmerge.ui
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
-    <property name="step_increment">1</property>
+    <property name="step-increment">1</property>
   </object>
   <object class="GtkAdjustment" id="adjustment2">
     <property name="lower">1</property>
-    <property name="step_increment">1</property>
+    <property name="step-increment">1</property>
   </object>
   <object class="GtkDialog" id="MailmergeDialog">
-    <property name="can_focus">False</property>
-    <property name="border_width">5</property>
+    <property name="can-focus">False</property>
+    <property name="border-width">5</property>
     <property name="title" translatable="yes" 
context="mailmerge|MailmergeDialog">Mail Merge</property>
     <property name="modal">True</property>
-    <property name="default_width">0</property>
-    <property name="default_height">0</property>
-    <property name="type_hint">dialog</property>
+    <property name="default-width">0</property>
+    <property name="default-height">0</property>
+    <property name="type-hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="can-focus">False</property>
+            <property name="layout-style">end</property>
             <child>
               <object class="GtkButton" id="ok">
                 <property name="label" translatable="yes" 
context="stock">_OK</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="can-default">True</property>
+                <property name="has-default">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -47,8 +47,8 @@
               <object class="GtkButton" id="cancel">
                 <property name="label" translatable="yes" 
context="stock">_Cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -61,8 +61,8 @@
               <object class="GtkButton" id="help">
                 <property name="label" translatable="yes" 
context="stock">_Help</property>
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
               </object>
               <packing>
@@ -76,23 +76,23 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
+            <property name="pack-type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="beamer">
-                <property name="height_request">150</property>
+                <property name="height-request">150</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
               </object>
@@ -105,36 +105,36 @@
             <child>
               <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
+                <property name="can-focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="spacing">12</property>
                 <child>
                   <object class="GtkFrame" id="frame1">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">none</property>
                     <child>
                       <object class="GtkBox" id="box3">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="valign">start</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
                         <property name="margin-start">12</property>
                         <property name="margin-top">6</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="all">
                             <property name="label" translatable="yes" 
context="mailmerge|all">_All</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">False</property>
+                            <property name="use-underline">True</property>
                             <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="draw-indicator">True</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" id="all-atkobject">
                                 <property 
name="AtkObject::accessible-description" translatable="yes" 
context="mailmerge|extended_tip|all">Processes all the records from the 
database.</property>
@@ -151,10 +151,10 @@
                           <object class="GtkRadioButton" id="selected">
                             <property name="label" translatable="yes" 
context="mailmerge|selected">_Selected records</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">False</property>
+                            <property name="use-underline">True</property>
+                            <property name="draw-indicator">True</property>
                             <property name="group">all</property>
                             <child internal-child="accessible">
                               <object class="AtkObject" 
id="selected-atkobject">
@@ -171,16 +171,16 @@
                         <child>
                           <object class="GtkBox" id="box4">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="spacing">12</property>
                             <child>
                               <object class="GtkRadioButton" id="rbfrom">
                                 <property name="label" translatable="yes" 
context="mailmerge|rbfrom">_From:</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="can-focus">True</property>
+                                <property 
name="receives-default">False</property>
+                                <property name="use-underline">True</property>
+                                <property name="draw-indicator">True</property>
                                 <property name="group">all</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" 
id="rbfrom-atkobject">
@@ -197,11 +197,11 @@
                             <child>
                               <object class="GtkSpinButton" id="from">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="activates_default">True</property>
+                                <property name="can-focus">True</property>
+                                <property 
name="activates-default">True</property>
+                                <property 
name="truncate-multiline">True</property>
                                 <property 
name="adjustment">adjustment1</property>
                                 <property name="numeric">True</property>
-                                <property 
name="truncate-multiline">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" 
id="from-atkobject">
                                     <property 
name="AtkObject::accessible-description" translatable="yes" 
context="mailmerge|extended_tip|from">Specify the number of the first record to 
be printed.</property>
@@ -217,10 +217,10 @@
                             <child>
                               <object class="GtkLabel" id="label3">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes" 
context="mailmerge|label3">_To:</property>
-                                <property name="use_underline">True</property>
-                                <property name="mnemonic_widget">to</property>
+                                <property name="use-underline">True</property>
+                                <property name="mnemonic-widget">to</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -231,11 +231,11 @@
                             <child>
                               <object class="GtkSpinButton" id="to">
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="activates_default">True</property>
+                                <property name="can-focus">True</property>
+                                <property 
name="activates-default">True</property>
+                                <property 
name="truncate-multiline">True</property>
                                 <property 
name="adjustment">adjustment2</property>
                                 <property name="numeric">True</property>
-                                <property 
name="truncate-multiline">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="to-atkobject">
                                     <property 
name="AtkObject::accessible-description" translatable="yes" 
context="mailmerge|extended_tip|to">Specify the number of the last record to be 
printed.</property>
@@ -260,7 +260,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="recordslabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes" 
context="mailmerge|recordslabel">Records</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -277,33 +277,33 @@
                 <child>
                   <object class="GtkFrame" id="frame2">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can-focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">none</property>
                     <child>
                       <object class="GtkBox" id="box5">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
+                        <property name="can-focus">False</property>
                         <property name="margin-start">12</property>
                         <property name="margin-top">6</property>
+                        <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkBox" id="box6">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkRadioButton" id="printer">
                                 <property name="label" translatable="yes" 
context="mailmerge|printer">_Printer</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="receives_default">False</property>
-                                <property name="use_underline">True</property>
+                                <property name="can-focus">True</property>
+                                <property 
name="receives-default">False</property>
+                                <property name="use-underline">True</property>
                                 <property name="active">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="draw-indicator">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" 
id="printer-atkobject">
                                     <property 
name="AtkObject::accessible-description" translatable="yes" 
context="mailmerge|extended_tip|printer">Prints the form letters.</property>
@@ -320,10 +320,10 @@
                               <object class="GtkRadioButton" id="electronic">
                                 <property name="label" translatable="yes" 
context="mailmerge|electronic">_Electronic</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="can-focus">True</property>
+                                <property 
name="receives-default">False</property>
+                                <property name="use-underline">True</property>
+                                <property name="draw-indicator">True</property>
                                 <property name="group">printer</property>
                               </object>
                               <packing>
@@ -336,10 +336,10 @@
                               <object class="GtkRadioButton" id="file">
                                 <property name="label" translatable="yes" 
context="mailmerge|file">File</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property 
name="receives_default">False</property>
-                                <property name="use_underline">True</property>
-                                <property name="draw_indicator">True</property>
+                                <property name="can-focus">True</property>
+                                <property 
name="receives-default">False</property>
+                                <property name="use-underline">True</property>
+                                <property name="draw-indicator">True</property>
                                 <property name="group">printer</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" 
id="file-atkobject">
@@ -364,10 +364,10 @@
                           <object class="GtkCheckButton" id="singlejobs">
                             <property name="label" translatable="yes" 
context="mailmerge|singlejobs">_Single print jobs</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="receives-default">False</property>
+                            <property name="use-underline">True</property>
+                            <property name="draw-indicator">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -378,36 +378,36 @@
                         <child>
                           <object class="GtkFrame" id="frame3">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can-focus">False</property>
                             <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">none</property>
+                            <property name="label-xalign">0</property>
+                            <property name="shadow-type">none</property>
                             <child>
                               <object class="GtkFrame" id="frame4">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="label_xalign">0</property>
-                                <property name="shadow_type">none</property>
+                                <property name="can-focus">False</property>
                                 <property name="margin-start">12</property>
                                 <property name="margin-top">6</property>
+                                <property name="label-xalign">0</property>
+                                <property name="shadow-type">none</property>
                                 <child>
-                                  <!-- n-columns=1 n-rows=1 -->
+                                  <!-- n-columns=3 n-rows=12 -->
                                   <object class="GtkGrid" id="grid1">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="row_spacing">6</property>
-                                    <property 
name="column_spacing">6</property>
+                                    <property name="can-focus">False</property>
                                     <property name="margin-start">12</property>
                                     <property name="margin-top">6</property>
+                                    <property name="row-spacing">6</property>
+                                    <property 
name="column-spacing">6</property>
                                     <child>
                                       <object class="GtkCheckButton" 
id="generate">
                                         <property name="label" 
translatable="yes" context="mailmerge|generate">Generate file name from 
_database</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">False</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">False</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="draw-indicator">True</property>
                                         <child internal-child="accessible">
                                           <object class="AtkObject" 
id="generate-atkobject">
                                             <property 
name="AtkObject::accessible-description" translatable="yes" 
context="mailmerge|extended_tip|generate">Generate each file name from data 
contained in a database.</property>
@@ -415,58 +415,58 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">0</property>
+                                        <property 
name="left-attach">0</property>
+                                        <property 
name="top-attach">0</property>
                                         <property name="width">3</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="fieldlabel">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="halign">start</property>
                                         <property name="label" 
translatable="yes" context="mailmerge|fieldlabel">Field:</property>
                                         <property name="xalign">0</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">1</property>
+                                        <property 
name="left-attach">0</property>
+                                        <property 
name="top-attach">1</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" id="pathlabel">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="halign">start</property>
                                         <property name="label" 
translatable="yes" context="mailmerge|pathlabel">_Path:</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="mnemonic_widget">path</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="mnemonic-widget">path</property>
                                         <property name="xalign">0</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">2</property>
+                                        <property 
name="left-attach">0</property>
+                                        <property 
name="top-attach">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" 
id="fileformatlabel">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="halign">start</property>
                                         <property name="label" 
translatable="yes" context="mailmerge|fileformatlabel">F_ile format:</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="mnemonic_widget">fileformat</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="mnemonic-widget">fileformat</property>
                                         <property name="xalign">0</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">3</property>
+                                        <property 
name="left-attach">0</property>
+                                        <property 
name="top-attach">3</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxText" 
id="field">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <child internal-child="accessible">
                                           <object class="AtkObject" 
id="field-atkobject">
                                             <property 
name="AtkObject::accessible-description" translatable="yes" 
context="mailmerge|extended_tip|field">Uses the content of the selected 
database field as the file name for the form letter.</property>
@@ -474,15 +474,15 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">1</property>
+                                        <property 
name="left-attach">1</property>
+                                        <property 
name="top-attach">1</property>
                                         <property name="width">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxText" 
id="fileformat">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <child internal-child="accessible">
                                           <object class="AtkObject" 
id="fileformat-atkobject">
                                             <property 
name="AtkObject::accessible-description" translatable="yes" 
context="mailmerge|extended_tip|fileformat">Select the file format to store the 
resulting document.</property>
@@ -490,8 +490,8 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">3</property>
+                                        <property 
name="left-attach">1</property>
+                                        <property 
name="top-attach">3</property>
                                         <property name="width">2</property>
                                       </packing>
                                     </child>
@@ -499,9 +499,9 @@
                                       <object class="GtkButton" id="pathpb">
                                         <property name="label">_...</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">True</property>
-                                        <property 
name="use_underline">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">True</property>
+                                        <property 
name="use-underline">True</property>
                                         <child internal-child="accessible">
                                           <object class="AtkObject" 
id="pathpb-atkobject">
                                             <property 
name="AtkObject::accessible-description" translatable="yes" 
context="mailmerge|extended_tip|pathpb">Opens the Select Path dialog.</property>
@@ -509,15 +509,15 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">2</property>
-                                        <property 
name="top_attach">2</property>
+                                        <property 
name="left-attach">2</property>
+                                        <property 
name="top-attach">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="path">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="activates_default">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="activates-default">True</property>
                                         <property 
name="truncate-multiline">True</property>
                                         <child internal-child="accessible">
                                           <object class="AtkObject" 
id="path-atkobject">
@@ -526,65 +526,65 @@
                                         </child>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">2</property>
+                                        <property 
name="left-attach">1</property>
+                                        <property 
name="top-attach">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" 
id="subjectlabel">
                                         <property 
name="visible">True</property>
                                         <property 
name="sensitive">False</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="halign">start</property>
                                         <property name="label" 
translatable="yes" context="mailmerge|subjectlabel">_Subject:</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="mnemonic_widget">subject</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="mnemonic-widget">subject</property>
                                         <property name="xalign">0</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">7</property>
+                                        <property 
name="left-attach">0</property>
+                                        <property 
name="top-attach">7</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" id="subject">
                                         <property 
name="visible">True</property>
                                         <property 
name="sensitive">False</property>
-                                        <property 
name="can_focus">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="activates-default">True</property>
                                         <property 
name="truncate-multiline">True</property>
-                                        <property 
name="activates_default">True</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">7</property>
+                                        <property 
name="left-attach">1</property>
+                                        <property 
name="top-attach">7</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" 
id="attachmentslabel">
                                         <property 
name="visible">True</property>
                                         <property 
name="sensitive">False</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="halign">start</property>
                                         <property name="label" 
translatable="yes" context="mailmerge|attachmentslabel">Attachments:</property>
-                                        <property 
name="mnemonic_widget">attachments</property>
+                                        <property 
name="mnemonic-widget">attachments</property>
                                         <property name="xalign">0</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">8</property>
+                                        <property 
name="left-attach">0</property>
+                                        <property 
name="top-attach">8</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkEntry" 
id="attachments">
                                         <property 
name="visible">True</property>
                                         <property 
name="sensitive">False</property>
-                                        <property 
name="can_focus">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="activates-default">True</property>
                                         <property 
name="truncate-multiline">True</property>
-                                        <property 
name="activates_default">True</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">8</property>
+                                        <property 
name="left-attach">1</property>
+                                        <property 
name="top-attach">8</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -592,38 +592,38 @@
                                         <property name="label">_...</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="sensitive">False</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">True</property>
-                                        <property 
name="use_underline">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">True</property>
+                                        <property 
name="use-underline">True</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">2</property>
-                                        <property 
name="top_attach">8</property>
+                                        <property 
name="left-attach">2</property>
+                                        <property 
name="top-attach">8</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" 
id="mailformatlabel">
                                         <property 
name="visible">True</property>
                                         <property 
name="sensitive">False</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="halign">start</property>
                                         <property name="label" 
translatable="yes" context="mailmerge|mailformatlabel">Mail format:</property>
                                         <property name="xalign">0</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">9</property>
+                                        <property 
name="left-attach">0</property>
+                                        <property 
name="top-attach">9</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxText" 
id="address">
                                         <property 
name="sensitive">False</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="hexpand">True</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">6</property>
+                                        <property 
name="left-attach">1</property>
+                                        <property 
name="top-attach">6</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -631,14 +631,14 @@
                                         <property name="label" 
translatable="yes" context="mailmerge|html">HTM_L</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="sensitive">False</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">False</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">False</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="draw-indicator">True</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">9</property>
+                                        <property 
name="left-attach">1</property>
+                                        <property 
name="top-attach">9</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -646,14 +646,14 @@
                                         <property name="label" 
translatable="yes" context="mailmerge|rtf">RT_F</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="sensitive">False</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">False</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">False</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="draw-indicator">True</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">10</property>
+                                        <property 
name="left-attach">1</property>
+                                        <property 
name="top-attach">10</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -661,53 +661,53 @@
                                         <property name="label" 
translatable="yes" context="mailmerge|swriter">%PRODUCTNAME Writer</property>
                                         <property 
name="visible">True</property>
                                         <property 
name="sensitive">False</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">False</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">False</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="draw-indicator">True</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">11</property>
+                                        <property 
name="left-attach">1</property>
+                                        <property 
name="top-attach">11</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkCheckButton" 
id="passwd-check">
                                         <property name="label" 
translatable="yes" context="mailmerge|passwd-check">Save with 
password</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">False</property>
-                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">False</property>
+                                        <property 
name="draw-indicator">True</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">4</property>
+                                        <property 
name="left-attach">0</property>
+                                        <property 
name="top-attach">4</property>
                                         <property name="width">2</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkLabel" 
id="passwd-label">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="halign">start</property>
                                         <property name="label" 
translatable="yes" context="mailmerge|passwd-label">Password field:</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="mnemonic_widget">passwd-combobox</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="mnemonic-widget">passwd-combobox</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">0</property>
-                                        <property 
name="top_attach">5</property>
+                                        <property 
name="left-attach">0</property>
+                                        <property 
name="top-attach">5</property>
                                       </packing>
                                     </child>
                                     <child>
                                       <object class="GtkComboBoxText" 
id="passwd-combobox">
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">False</property>
+                                        <property 
name="can-focus">False</property>
                                         <property 
name="hexpand">True</property>
                                       </object>
                                       <packing>
-                                        <property 
name="left_attach">1</property>
-                                        <property 
name="top_attach">5</property>
+                                        <property 
name="left-attach">1</property>
+                                        <property 
name="top-attach">5</property>
                                       </packing>
                                     </child>
                                     <child>
@@ -745,18 +745,18 @@
                                 <child type="label">
                                   <object class="GtkBox" id="box7">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
+                                    <property name="can-focus">False</property>
                                     <property 
name="orientation">vertical</property>
                                     <property name="spacing">6</property>
                                     <child>
                                       <object class="GtkRadioButton" 
id="singledocument">
                                         <property name="label" 
translatable="yes" context="mailmerge|singledocument">S_ave as single 
document</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">False</property>
-                                        <property 
name="use_underline">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">False</property>
+                                        <property 
name="use-underline">True</property>
                                         <property name="active">True</property>
-                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="draw-indicator">True</property>
                                         <child internal-child="accessible">
                                           <object class="AtkObject" 
id="singledocument-atkobject">
                                             <property 
name="AtkObject::accessible-description" translatable="yes" 
context="mailmerge|extended_tip|singledocument">Create one big document 
containing all data records.</property>
@@ -773,10 +773,10 @@
                                       <object class="GtkRadioButton" 
id="individualdocuments">
                                         <property name="label" 
translatable="yes" context="mailmerge|individualdocuments">Sa_ve as individual 
documents</property>
                                         <property 
name="visible">True</property>
-                                        <property 
name="can_focus">True</property>
-                                        <property 
name="receives_default">False</property>
-                                        <property 
name="use_underline">True</property>
-                                        <property 
name="draw_indicator">True</property>
+                                        <property 
name="can-focus">True</property>
+                                        <property 
name="receives-default">False</property>
+                                        <property 
name="use-underline">True</property>
+                                        <property 
name="draw-indicator">True</property>
                                         <property 
name="group">singledocument</property>
                                         <child internal-child="accessible">
                                           <object class="AtkObject" 
id="individualdocuments-atkobject">
@@ -797,7 +797,7 @@
                             <child type="label">
                               <object class="GtkLabel" id="savemergeddoclabel">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
+                                <property name="can-focus">False</property>
                                 <property name="label" translatable="yes" 
context="mailmerge|savemergeddoclabel">Save Merged Document</property>
                                 <attributes>
                                   <attribute name="weight" value="bold"/>
@@ -816,7 +816,7 @@
                     <child type="label">
                       <object class="GtkLabel" id="outputlabel">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can-focus">False</property>
                         <property name="label" translatable="yes" 
context="mailmerge|outputlabel">Output</property>
                         <attributes>
                           <attribute name="weight" value="bold"/>
@@ -851,9 +851,6 @@
       <action-widget response="-6">cancel</action-widget>
       <action-widget response="-11">help</action-widget>
     </action-widgets>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
     <child internal-child="accessible">
       <object class="AtkObject" id="MailmergeDialog-atkobject">
         <property name="AtkObject::accessible-description" translatable="yes" 
context="mailmerge|extended_tip|MailmergeDialog">The Mail Merge dialog helps 
you in printing and saving form letters.</property>

Reply via email to