[Libreoffice-commits] core.git: instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice

Roman Kuznetsov (via logerrit) logerrit at kemper.freedesktop.org
Wed Dec 11 14:52:50 UTC 2019


 instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt |    8 +++++---
 instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf  |    5 +++++
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 128dabf58a535d422eb27f8dc760c81e54c6b354
Author:     Roman Kuznetsov <antilibreoffice at gmail.com>
AuthorDate: Thu Dec 5 22:00:46 2019 +0200
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Wed Dec 11 15:51:37 2019 +0100

    tdf#128991 Make clear in the help installer
    
    that it must be installed into the same directory as LibreOffice
    
    and some visual fix in layout
    
    Change-Id: I8048c332bf381137689bfa1695862cf7d118f0a8
    Reviewed-on: https://gerrit.libreoffice.org/84582
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>

diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
index 1e956b19574c..47b12d84a87f 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt
@@ -90,12 +90,14 @@ DestinationFolder	Banner	Bitmap	0	0	474	44	1		BannerBmp
 DestinationFolder	BannerLine	Line	0	44	474	0	1				
 DestinationFolder	Cancel	PushButton	401	243	66	17	3		OOO_CONTROL_87	ChangeFolder	
 DestinationFolder	ChangeFolder	PushButton	401	125	66	17	3		OOO_CONTROL_88	Back	
-DestinationFolder	DestFolder	Icon	21	112	24	24	5242881		OpenFolderIco		
+DestinationFolder	DestFolder	Icon	21	122	24	24	5242881		OpenFolderIco		
 DestinationFolder	DlgDesc	Text	21	23	372	25	65539		OOO_CONTROL_304		
 DestinationFolder	DlgLine	Line	114	234	360	0	1				
-DestinationFolder	DlgTitle	Text	13	6	380	25	65539		{&MSSansBold8}[ProductName]		
+DestinationFolder	DlgTitle	Text	13	6	380	25	65539		{&DialogDefaultBold}[ProductName]		
+DestinationFolder	Attention	Text	57	60	340	15	3		OOO_CONTROL_327		
+DestinationFolder	AttText	Text	57	75	340	40	3		OOO_CONTROL_328		
 DestinationFolder	Location	Text	57	128	340	40	3	_BrowseProperty	[INSTALLLOCATION]		
-DestinationFolder	LocLabel	Text	57	115	390	10	3		OOO_CONTROL_92		
+DestinationFolder	LocLabel	Text	57	106	390	12	3		OOO_CONTROL_92		
 DestinationFolder	Next	PushButton	330	243	66	17	3		OOO_CONTROL_93	Cancel	
 DestinationFolder	LabelStartInstall	Text	21	52	390	30	2		OOO_CONTROL_300		
 DestinationFolder	LabelInvalidDir	Text	21	52	390	30	2		OOO_CONTROL_301		
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
index f870136beb02..6c12870e861d 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
@@ -700,3 +700,8 @@ en-US = "Cancel"
 [OOO_CONTROL_326]
 en-US = "OK"
 
+[OOO_CONTROL_327]
+en-US = "{&DialogDefaultBold}Attention!"
+
+[OOO_CONTROL_328]
+en-US = "LibreOffice help must be installed into the installation directory of LibreOffice program."


More information about the Libreoffice-commits mailing list