[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - 2 commits - cui/inc instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice
Seth Chaiklin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Dec 12 06:11:13 UTC 2019
cui/inc/tipoftheday.hrc | 7 ++++---
instsetoo_native/inc_ooohelppack/windows/msi_templates/Control.idt | 8 +++++---
instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf | 5 +++++
3 files changed, 14 insertions(+), 6 deletions(-)
New commits:
commit 2c1e9249247ffd67f931a063047cd1690aac0aa6
Author: Seth Chaiklin <sdc.blanco at youmail.dk>
AuthorDate: Tue Dec 10 13:42:40 2019 +0100
Commit: Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Thu Dec 12 07:10:40 2019 +0100
tdf#127294 one new tip of the day; clarification of three existing tips
1. It seems that inserting images in shapes only works in Writer, so
added correction to make this tip Writer-specific.
2. Added a tip about how to insert images and photos to shapes in
Draw and Impress.
3. Small wording adjustment in two other tips
Change-Id: Ife6d7164af294803ca0ec50487b1e2d7b6a9d75a
Reviewed-on: https://gerrit.libreoffice.org/84830
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
(cherry picked from commit d115fabdc6927bfcc48e7e7be5bad546c66b11ad)
Reviewed-on: https://gerrit.libreoffice.org/84958
Reviewed-by: Seth Chaiklin <sdc.blanco at youmail.dk>
diff --git a/cui/inc/tipoftheday.hrc b/cui/inc/tipoftheday.hrc
index 8c62a80822be..060fdd97c24a 100644
--- a/cui/inc/tipoftheday.hrc
+++ b/cui/inc/tipoftheday.hrc
@@ -65,7 +65,7 @@ const std::tuple<const char*, OUString, OUString> TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Use View > Value Highlighting to display cell contents in colors: Text/black, Formulas/green, Numbers/blue, Protected cells/grey background."), "https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/scalc/01/03080000.html", "tipoftheday_c.png"}, //local help missing
{ NC_("RID_CUI_TIPOFTHEDAY", "Create different master pages in a presentation template: View > Master Slide and Slide > New Master (or per toolbar or right click in slide pane)."), "", "tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to sort a pivot table? Click on drop-list's arrow in the row/col header and select sort method: ascending, descending, or custom."), "", "tipoftheday_c.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Display photos or images with different shapes. Insert and select shape, then Insert > Image. To adjust image, right-click on selected shape and choose Area."), "", ""},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Display photos or images with different shapes in Writer. Insert and select shape, then Insert > Image. To adjust image, right-click on selected shape and choose Area."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use Page/Slide > Properties > 'Fit object to paper format' in Draw/Impress to resize the objects so that they fit on your chosen paper format."), "", "tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Fit the entire page in a Draw window, use * on the number pad."), "", "tipoftheday_d.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "In a Draw page, use '-' to zoom out; '+' to zoom in."), "", "tipoftheday_d.png"},
@@ -77,9 +77,10 @@ const std::tuple<const char*, OUString, OUString> TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Ctrl+Shift+F9 recalculates all formulas in all spreadsheets."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use the Backspace key instead of Delete in Calc. You can choose what to delete."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Best way to fix bad-looking MS Word table cells via Table > Size > Optimal Row Height / Column Width."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Repeat the heading on a subsequent page when a table spans over more than one page with Table > Table Properties > Text Flow > Repeat heading."), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "To repeat a table heading when a table spans over a page, use Table > Table Properties > Text Flow > Repeat heading."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To quickly insert or delete rows, select the desired number of rows (or columns) and press Ctrl+ to add or Ctrl- to delete."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "To repeat rows/columns on every pages use Format > Print Ranges > Edit."), "", "tipoftheday_c.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Insert images and photos into shapes in Draw and Impress. Right-click on a shape, choose Area > Bitmap > Add/Import, and use Options to adjust appearance."), "", ""},
{ NC_("RID_CUI_TIPOFTHEDAY", "Need to insert the date in a spreadsheet cell? Type Ctrl+; or Shift+Ctrl+; to insert the time."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Insert your metadata in your document with Insert > Fields > More Fields… > Document or DocInformation."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Get help from the community via the Ask portal."), "https://ask.libreoffice.org", ""},
@@ -107,7 +108,7 @@ const std::tuple<const char*, OUString, OUString> TIPOFTHEDAY_STRINGARRAY[] =
{ NC_("RID_CUI_TIPOFTHEDAY", "Open a CSV file as a new sheet in the current spreadsheet via Sheet > Sheet from file."), "", "tipoftheday_c.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Typing in bold, italics, or underlined in Writer you can continue with the default attributes using just the shortcut Ctrl+Shift+X (remove direct character formats)."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Use Ctrl+Alt+Shift+V to paste the contents of the clipboard as unformatted text."), "", "tipoftheday_w.png"},
- { NC_("RID_CUI_TIPOFTHEDAY", "Customize your footnotes page with Tools > Footnotes and Endnotes…"), "", "tipoftheday_w.png"},
+ { NC_("RID_CUI_TIPOFTHEDAY", "Customize footnote appearance with Tools > Footnotes and Endnotes…"), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "With ‘Slide Show > Custom Slide Show’, reorder and pick slides to fit a slideshow to the needs of your viewers."), "", "tipoftheday_i.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to change spell checking for some part of the text? Click in the language zone of the status bar or better, apply a style."), "", "tipoftheday_w.png"},
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer can insert a blank page between two odd (even) pages that follow. Check ‘Print automatically inserted blank pages’ in the print dialog’s %PRODUCTNAME Writer tab."), "", "tipoftheday_w.png"},
commit 1d294e39ba6bedf3d6f08bd360aa2841a422e733
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: Thu Dec 12 07:10:26 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>
(cherry picked from commit 128dabf58a535d422eb27f8dc760c81e54c6b354)
Reviewed-on: https://gerrit.libreoffice.org/84959
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