instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt      |    
8 ++++----
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt       |    
8 ++++----
 instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt            |    
8 ++++----
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |    
2 +-
 officecfg/registry/schema/org/openoffice/Office/Common.xcs               |    
4 ++--
 officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs           |    
1 -
 postprocess/signing/signing.pl                                           |    
1 +
 7 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit bbfa2264e58fcba76ec7929855b81347ed2201e6
Author:     Thais Vieira <thais.vie...@collabora.com>
AuthorDate: Fri Sep 4 08:21:28 2020 -0300
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:46:34 2024 +0100

    Loleaflet:fix menu entry
    
    replacing the 'Select...' to 'Select Table'
    to it be consistent with the pattern.
    
    Change-Id: I17ce12fb6dd51256d68c735b7934e4e2bf643fff
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102044
    Reviewed-by: Tor Lillqvist <t...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 6de8e0058a52..af2e7cb9fbd5 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -2076,7 +2076,7 @@
           <value xml:lang="en-US">Select Table</value>
         </prop>
         <prop oor:name="ContextLabel" oor:type="xs:string">
-          <value xml:lang="en-US">~Select...</value>
+          <value xml:lang="en-US">~Select Table</value>
         </prop>
         <prop oor:name="PopupLabel" oor:type="xs:string">
           <value xml:lang="en-US">Select Table</value>
commit 8bdcda095ae39718945def78929a659b4bce0e69
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Fri Apr 18 02:36:57 2014 -0700
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:45:12 2024 +0100

    [cp] Collabora Office ARP data
    
    Change-Id: I83d28b9bc7985f34303d3c3343f976b5a87009e1

diff --git 
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index ca9abc8110e1..c051543688fd 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -7,10 +7,10 @@ AgreeToLicense        No
 ApplicationUsers       AllUsers
 ALLUSERS       1
 ARPCOMMENTS    ARPCOMMENTSTEMPLATE
-ARPCONTACT     OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK    OOO_ARPHELPLINKTEMPLATE
-ARPURLINFOABOUT        OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO       OOO_ARPURLUPDATEINFOTEMPLATE
+ARPCONTACT     Collabora Productivity Ltd.
+ARPHELPLINK    https://CollaboraOffice.com
+ARPURLINFOABOUT        https://CollaboraOffice.com
+ARPURLUPDATEINFO       https://CollaboraOffice.com
 DefaultUIFont  DialogDefault
 DialogCaption  Windows Installer
 DiskPrompt     [1]
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index e528cac384ec..5a5b6e6ae2db 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -7,10 +7,10 @@ AgreeToLicense        No
 ApplicationUsers       AllUsers
 ALLUSERS       1
 ARPCOMMENTS    ARPCOMMENTSTEMPLATE
-ARPCONTACT     OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK    OOO_ARPHELPLINKTEMPLATE
-ARPURLINFOABOUT        OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO       OOO_ARPURLUPDATEINFOTEMPLATE
+ARPCONTACT     Collabora Productivity Ltd.
+ARPHELPLINK    https://CollaboraOffice.com
+ARPURLINFOABOUT        https://CollaboraOffice.com
+ARPURLUPDATEINFO       https://CollaboraOffice.com
 DefaultUIFont  DialogDefault
 DialogCaption  Windows Installer
 DiskPrompt     [1]
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
index bd9065fd92b5..9883f9bdf146 100644
--- a/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/Property.idt
@@ -6,10 +6,10 @@ _IsSetupTypeMin       Typical
 AgreeToLicense No
 ApplicationUsers       AllUsers
 ARPCOMMENTS    ARPCOMMENTSTEMPLATE
-ARPCONTACT     OOO_ARPCONTACTTEMPLATE
-ARPHELPLINK    OOO_ARPHELPLINKTEMPLATE
-ARPURLINFOABOUT        OOO_ARPURLINFOABOUTTEMPLATE
-ARPURLUPDATEINFO       OOO_ARPURLUPDATEINFOTEMPLATE
+ARPCONTACT     Collabora Productivity Ltd.
+ARPHELPLINK    https://CollaboraOffice.com
+ARPURLINFOABOUT        https://CollaboraOffice.com
+ARPURLUPDATEINFO       https://CollaboraOffice.com
 ARPNOREPAIR    1
 ARPNOMODIFY    1
 DefaultUIFont  Tahoma8
commit dce0227150c21117849abd873ecc1cc921d06fe8
Author:     Andras Timar <andras.ti...@collabora.com>
AuthorDate: Wed Apr 18 07:19:00 2018 -0700
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:44:57 2024 +0100

    [cp] HACK: sleep before sign
    
    On Windows, with 16x parallel build, build-nocheck target fails,
    because it tries to sign a file that is already in use (gengal).
    
    Change-Id: Ic582334f2c02f5e38f49d048fc0425025ffeee41
    Reviewed-on: https://gerrit.libreoffice.org/75235
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/postprocess/signing/signing.pl b/postprocess/signing/signing.pl
index 793900ca074c..80a9c01866a3 100644
--- a/postprocess/signing/signing.pl
+++ b/postprocess/signing/signing.pl
@@ -41,6 +41,7 @@ my @args        = ();
 my @files_to_sign = ();
 
 #### main #####
+sleep(120);
 $myname = script_id();
 if ( $#ARGV < 2 ) {
     usage();
commit 90a59c0060c547a70a5b8e2dfa92f49e8c96fc84
Author:     László Németh <nem...@numbertext.org>
AuthorDate: Mon Mar 26 22:08:26 2018 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:44:45 2024 +0100

    [cp] tdf#116586 hu_AkH11 is not a default personal dictionary
    
    Reviewed-on: https://gerrit.libreoffice.org/51921
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Tested-by: Jenkins <c...@libreoffice.org>
    (cherry picked from commit 2d08125e2ad971ac81ba8ca7a0af616e768372e6)
    
    Change-Id: Ib3ea432872d5bb729c9b56d66a9c338cff2bbf8b

diff --git a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
index 8fcb6a3ccd62..ca128b569e6c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Linguistic.xcs
@@ -201,7 +201,6 @@
             <it>en-GB.dic</it>
             <it>sl.dic</it>
             <it>technical.dic</it>
-            <it>hu_AkH11.dic</it>
           </value>
         </prop>
         <prop oor:name="IsUseDictionaryList" oor:type="xs:boolean" 
oor:nillable="false">
commit 12b628298a4489b51cf0305a00aac34040236154
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun May 7 09:29:00 2017 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:44:32 2024 +0100

    [cp] tdf#107649: Try system credentials first by default
    
    Change-Id: I39f3cd85153f939c1a5ebd7c6830c0175328a966
    Reviewed-on: https://gerrit.libreoffice.org/37335
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    Tested-by: Andras Timar <andras.ti...@collabora.com>
    (cherry picked from commit 0be936f739752ce773f1c77f2c1dab022af785f5)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113279
    Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index d37982060454..558711497328 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -758,7 +758,7 @@
           automatically for all resources that support it (regardless of 
whether they are
           in "AuthenticateUsingSystemCredentials" list or not).</desc>
         </info>
-        <value>false</value>
+        <value>true</value>
       </prop>
     </group>
     <group oor:name="Drawinglayer">
commit 6522ddbc5754d7e557b5beeb8fe5dcde9c52a631
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Sep 30 17:26:11 2020 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Jan 13 20:44:12 2024 +0100

    [cp] Disable BuiltInHelpNotInstalledPopUp by default
    
    Change-Id: Iac00c3d12113dfb66e3753c04a8e10f4802e5cfd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103661
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>
    (cherry picked from commit f1d6eb20ef0acb9c982c7d89e798cd77901283e8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113278
    Tested-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 53aa213ac80d..d37982060454 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -3359,7 +3359,7 @@
         <info>
           <desc>Activates "Built-in help is not installed" pop-up</desc>
         </info>
-        <value>true</value>
+        <value>false</value>
       </prop>
       <prop oor:name="HelpStyleSheet" oor:type="xs:string" 
oor:nillable="false">
         <info>

Reply via email to