From 6cc0a5829ae1393f8105fc79bc4fb1ed2fb1e610 Mon Sep 17 00:00:00 2001 From: wp_xxyyzz Date: Fri, 11 Nov 2022 23:09:27 +0000 Subject: [PATCH] GridPrinter: Fix minor oversights in previous commit. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8610 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/gridprinter/languages/gridprnstrings.de.po | 8 ++++---- components/gridprinter/languages/gridprnstrings.en.po | 6 +++--- components/gridprinter/languages/gridprnstrings.pot | 2 +- components/gridprinter/source/gridprnpreviewform.pas | 1 + components/gridprinter/source/gridprnstrings.pas | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/components/gridprinter/languages/gridprnstrings.de.po b/components/gridprinter/languages/gridprnstrings.de.po index 584efe81d..c8c016bab 100644 --- a/components/gridprinter/languages/gridprnstrings.de.po +++ b/components/gridprinter/languages/gridprnstrings.de.po @@ -56,7 +56,7 @@ msgstr "Kopfzeile" #: gridprnstrings.rsheaderfooter msgctxt "gridprnstrings.rsheaderfooter" msgid "Header/footer..." -msgstr "Kopf-/Fußzeile" +msgstr "Kopf-/Fußzeile..." #: gridprnstrings.rsheaderfooterhint msgctxt "gridprnstrings.rsheaderfooterhint" @@ -116,7 +116,7 @@ msgstr "Originalgröße (100%)" #: gridprnstrings.rspageandzoominfo #, object-pascal-format msgid "Page %0:d of %1:d, Zoom %2:d %%" -msgstr "Seite %d von %d, Skalierung %d %%" +msgstr "Seite %0:d von %1:d, Skalierung %2:d %%" #: gridprnstrings.rspageinfo #, object-pascal-format @@ -137,8 +137,8 @@ msgid "Page margins configuration" msgstr "Einstellung der Seitenränder" #: gridprnstrings.rspagemarginshint -msgid "Page margins" -msgstr "Seitenränder" +msgid "Show/hide page margins" +msgstr "Seitenränder anzeigen/verbergen" #: gridprnstrings.rspagesetuphint msgid "Page setup options" diff --git a/components/gridprinter/languages/gridprnstrings.en.po b/components/gridprinter/languages/gridprnstrings.en.po index 44b901fa3..6162af57d 100644 --- a/components/gridprinter/languages/gridprnstrings.en.po +++ b/components/gridprinter/languages/gridprnstrings.en.po @@ -115,7 +115,6 @@ msgstr "Original size (100%)" #: gridprnstrings.rspageandzoominfo #, object-pascal-format -#| msgid "Page %d of %d, Zoom %d %%" msgid "Page %0:d of %1:d, Zoom %2:d %%" msgstr "Page %0:d of %1:d, Zoom %2:d %%" @@ -138,8 +137,9 @@ msgid "Page margins configuration" msgstr "Page margins configuration" #: gridprnstrings.rspagemarginshint -msgid "Page margins" -msgstr "Page margins" +#| msgid "Page margins" +msgid "Show/hide page margins" +msgstr "Show/hide page margins" #: gridprnstrings.rspagesetuphint msgid "Page setup options" diff --git a/components/gridprinter/languages/gridprnstrings.pot b/components/gridprinter/languages/gridprnstrings.pot index a55f1ba7a..a7312f912 100644 --- a/components/gridprinter/languages/gridprnstrings.pot +++ b/components/gridprinter/languages/gridprnstrings.pot @@ -119,7 +119,7 @@ msgid "Page margins configuration" msgstr "" #: gridprnstrings.rspagemarginshint -msgid "Page margins" +msgid "Show/hide page margins" msgstr "" #: gridprnstrings.rspagesetuphint diff --git a/components/gridprinter/source/gridprnpreviewform.pas b/components/gridprinter/source/gridprnpreviewform.pas index 72e753dd9..a0c463770 100644 --- a/components/gridprinter/source/gridprnpreviewform.pas +++ b/components/gridprinter/source/gridprnpreviewform.pas @@ -322,6 +322,7 @@ end; procedure TGridPrintPreviewForm.acPageMarginsExecute(Sender: TObject); begin acPageMargins.Checked := not acPageMargins.Checked; + acPageMargins.Caption := MarkAsChecked(RSPageMargins, acPageMargins.Checked); PreviewImage.Invalidate; end; diff --git a/components/gridprinter/source/gridprnstrings.pas b/components/gridprinter/source/gridprnstrings.pas index 428c1bad9..0ee01750f 100644 --- a/components/gridprinter/source/gridprnstrings.pas +++ b/components/gridprinter/source/gridprnstrings.pas @@ -30,7 +30,7 @@ resourcestring RSHeaderFooter = 'Header/footer...'; RSHeaderFooterHint = 'Header/footer configuration'; RSPageMargins = 'Margins'; - RSPageMarginsHint = 'Page margins'; + RSPageMarginsHint = 'Show/hide page margins'; RSPrintColsFirst = 'Columns first'; RSPrintColsFirstHint = 'First print columns from top to bottom,' + LineEnding + 'then print from left to right';