cui/uiconfig/ui/optsecuritypage.ui |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 20f0c887f41cae9f7ce5ac61925db39aa9a9ef25
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Sep 7 11:28:40 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Sep 7 15:16:33 2023 +0200

    don't need non-default image-position with no image
    
    Change-Id: I8a165221c9b2175d6e9b4096427bfe309cbee36c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156656
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/cui/uiconfig/ui/optsecuritypage.ui 
b/cui/uiconfig/ui/optsecuritypage.ui
index 2863fd4329bf..9e274cba4a09 100644
--- a/cui/uiconfig/ui/optsecuritypage.ui
+++ b/cui/uiconfig/ui/optsecuritypage.ui
@@ -528,7 +528,6 @@ Do you want to delete password list and reset master 
password?</property>
                 <property name="has-default">True</property>
                 <property name="receives-default">True</property>
                 <property name="use-underline">True</property>
-                <property name="image-position">right</property>
               </object>
               <packing>
                 <property name="left-attach">1</property>
commit f4c6b97fc161d5d8a2c04022ba988108bec34166
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Sep 7 11:16:18 2023 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Sep 7 15:16:27 2023 +0200

    fix translation context for new strings
    
    since:
    
    commit 92b6ffcd9f687cc54a0fc3801ca85c7e4d77512f
    Date:   Fri Jun 30 11:22:01 2023 +0300
    
        Allow selecting a custom certificate manager
    
    Change-Id: Ie96a6e932e09318d031e954b73b928e5b854ec5f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156655
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/cui/uiconfig/ui/optsecuritypage.ui 
b/cui/uiconfig/ui/optsecuritypage.ui
index 0c6099e2a55b..2863fd4329bf 100644
--- a/cui/uiconfig/ui/optsecuritypage.ui
+++ b/cui/uiconfig/ui/optsecuritypage.ui
@@ -499,16 +499,16 @@ Do you want to delete password list and reset master 
password?</property>
           <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="row-spacing">8</property>
-            <property name="column-spacing">24</property>
             <property name="margin-start">12</property>
             <property name="margin-top">6</property>
+            <property name="row-spacing">8</property>
+            <property name="column-spacing">24</property>
             <child>
               <object class="GtkLabel" id="label11">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="label" translatable="yes" 
context="optsecuritypage|label9">Select custom certificate manager executable. 
Note that LibreOffice tries to locate installed ones automatically.</property>
+                <property name="label" translatable="yes" 
context="optsecuritypage|label11">Select custom certificate manager executable. 
Note that LibreOffice tries to locate installed ones automatically.</property>
                 <property name="wrap">True</property>
                 <property name="width-chars">56</property>
                 <property name="max-width-chars">56</property>
@@ -521,7 +521,7 @@ Do you want to delete password list and reset master 
password?</property>
             </child>
             <child>
               <object class="GtkButton" id="browse">
-                <property name="label" translatable="yes" 
context="stock1">_Browse...</property>
+                <property name="label" translatable="yes" 
context="optsecuritypage|browse">_Browse...</property>
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="can-default">True</property>

Reply via email to