diff --git a/components/fpspreadsheet/languages/fpsstrings.de.po b/components/fpspreadsheet/languages/fpsstrings.de.po
index c2a9de98c..f88634be4 100644
--- a/components/fpspreadsheet/languages/fpsstrings.de.po
+++ b/components/fpspreadsheet/languages/fpsstrings.de.po
@@ -21,6 +21,7 @@ msgid "All spreadsheet files"
 msgstr "Alle Spreadsheet-Dateien"
 
 #: fpsstrings.rsambiguousdecthouseparator
+#, object-pascal-format
 msgid "Assuming usage of decimal separator in \"%s\"."
 msgstr "Verwendung eines Dezimaltrennzeichens in \"%s\" wird angenommen."
 
@@ -37,6 +38,7 @@ msgid "blue"
 msgstr "blau"
 
 #: fpsstrings.rscannotreadfile
+#, object-pascal-format
 msgid "Cannot read file \"%s\". Wrong, unknown or defective file format?"
 msgstr "Kann Datei \"%s\" nicht lesen. Falsches, unbekanntes oder defektes Dateiformat?"
 
@@ -45,10 +47,12 @@ msgid "The cell range cannot be sorted because it contains merged cells."
 msgstr "Der Zellbereich kann nicht sortiert werden, weil er verbundene Zellen enthält."
 
 #: fpsstrings.rscircularreference
+#, object-pascal-format
 msgid "Circular reference found when calculating worksheet formula in cell %s"
 msgstr "Zirkulär-Referenz gefunden beim Berechnen der Formel in Zelle %s"
 
 #: fpsstrings.rscodepagenotsupported
+#, object-pascal-format
 msgid "Code page \"%s\" is not supported. Using \"cp1252\" (Latin 1) instead."
 msgstr "Code-Seite \"%s\" wird nicht unterstützt. Verwende stattdessen \"cp1252\" (Latin 1)."
 
@@ -57,6 +61,7 @@ msgid "Column style not found."
 msgstr "Spalten-Stil nicht gefunden."
 
 #: fpsstrings.rscommaexpected
+#, object-pascal-format
 msgid "Expected comma (,) at position %d, but got %s"
 msgstr "Komma erwartet an Position %d, aber %s gefunden"
 
@@ -77,22 +82,27 @@ msgid "dark red"
 msgstr "dunkelrot"
 
 #: fpsstrings.rsdefaultsheetname
+#, object-pascal-format
 msgid "Sheet%d"
 msgstr "Tabelle%d"
 
 #: fpsstrings.rsdefectiveinternalfilestructure
+#, object-pascal-format
 msgid "Defective internal structure of %s file."
 msgstr "Defekte innere Struktur der %s Datei."
 
 #: fpsstrings.rsdifferentsheetprintrange
+#, object-pascal-format
 msgid "Print range \"%s\" requires a different worksheet."
 msgstr "Der Druckbereich \"%s\" benötigt ein anderes Arbeitsblatt."
 
 #: fpsstrings.rsduplicateidentifier
+#, object-pascal-format
 msgid "An identifier with name \"%s\" already exists."
 msgstr "Ein Bezeichner mit dem Namen \"%s\" existiert bereits."
 
 #: fpsstrings.rsduplicateworksheetname
+#, object-pascal-format
 msgid "Duplicate worksheet \"%s\"."
 msgstr "Doppelter Arbeitsblattname \"%s\"."
 
@@ -113,14 +123,17 @@ msgid "Cannot evaluate: empty expression"
 msgstr "Leerer Ausdruck"
 
 #: fpsstrings.rsfilealreadyexists
+#, object-pascal-format
 msgid "File \"%s\" already exists."
 msgstr "Datei \"%s\" existiert bereits."
 
 #: fpsstrings.rsfileformatnotsupported
+#, object-pascal-format
 msgid "File format of \"%s\" not supported."
 msgstr "Dateiformat von \"%s\" nicht unterstützt."
 
 #: fpsstrings.rsfilenotfound
+#, object-pascal-format
 msgid "File \"%s\" not found."
 msgstr "Datei \"%s\" nicht gefunden."
 
@@ -129,6 +142,7 @@ msgid "files"
 msgstr "Dateien"
 
 #: fpsstrings.rsfilestructureerror
+#, object-pascal-format
 msgid "File structure error in %s record, position %d."
 msgstr "Dateistruktur-Fehler im Datensatz %s an Position %d."
 
@@ -137,6 +151,7 @@ msgid "Footer"
 msgstr "Fußzeile"
 
 #: fpsstrings.rsformulanotsupported
+#, object-pascal-format
 msgid "The formula in cell %s is not supported by this file format: %s"
 msgstr "Die Formel in Zelle %s wird in diesem Dateiformat nicht unterstützt: %s"
 
@@ -165,34 +180,43 @@ msgid "Image format not supported."
 msgstr "Bild-Format nicht unterstützt."
 
 #: fpsstrings.rsincorrectpositionofimageinheaderfooter
+#, object-pascal-format
 msgid "Incorrect position of %%G code in %s"
 msgstr "Falsche Position des %%G-Codes in %s"
 
 #: fpsstrings.rsindexinsstoutofrange
+#, object-pascal-format
 msgid "Index %d in SST out of range (0-%d)."
 msgstr "Index %d in der SST liegt außerhalb des gültigen Bereichs (0-%d)."
 
 #: fpsstrings.rsinvalidargumentcount
+#, object-pascal-format
 msgid "Invalid argument count for function %s"
 msgstr "Ungültige Anzahl von Argumenten für die Funktion %s"
 
 #: fpsstrings.rsinvalidcharacterincell
+#, object-pascal-format
 msgid "Invalid character(s) in cell %s."
 msgstr "Ungültige(s) Zeichen in Zelle %s."
 
 #: fpsstrings.rsinvalidcharacterincellcomment
+#, object-pascal-format
 msgid "Invalid character(s) in cell comment \"%s\"."
 msgstr "Ungültige(s) Zeichen im Zellkommentar \"%s\"."
 
 #: fpsstrings.rsinvaliddatetimeformat
-msgid "Trying to use an incompatible date/time format."
+#, object-pascal-format, fuzzy, badformat
+#| msgid "Trying to use an incompatible date/time format."
+msgid "Trying to use an incompatible date/time format (%s)."
 msgstr "Versuch ein inkompabibles Datum/Zeit-Format zu verwenden."
 
 #: fpsstrings.rsinvalidextension
+#, object-pascal-format
 msgid "Attempting to save a spreadsheet by extension, but the extension %s is not valid."
 msgstr "Versuch, das Format ein Arbeitsbuches anhand der Dateiendung zu erkennen, aber die Endung %s ist nicht gültig."
 
 #: fpsstrings.rsinvalidfloat
+#, object-pascal-format
 msgid "%s is not a valid floating-point value"
 msgstr "%s ist kein gültiger Gleitkomma-Wert"
 
@@ -201,10 +225,12 @@ msgid "Invalid font index"
 msgstr "Ungültiger Font-Index"
 
 #: fpsstrings.rsinvalidnumber
+#, object-pascal-format
 msgid "Invalid numerical value : %s"
 msgstr "Ungültiger Zahlenwert: %s"
 
 #: fpsstrings.rsinvalidnumberchar
+#, object-pascal-format
 msgid "Unexpected character in number : %s"
 msgstr "Unerwartetes Zeichen in Zahl: %s"
 
@@ -213,26 +239,32 @@ msgid "Trying to use an incompatible number format."
 msgstr "Versuch ein inkompatibles Zahlenformat zu verwenden."
 
 #: fpsstrings.rsinvalidresultcharacter
+#, object-pascal-format
 msgid "\"%s\" is not a valid return type indicator"
 msgstr "\"%s\" ist kein gültiger Indikator für einen Ergebnistyp"
 
 #: fpsstrings.rsinvalidresulttype
+#, object-pascal-format
 msgid "Invalid result type: %s"
 msgstr "Ungültiger Ergebnistyp: %s"
 
 #: fpsstrings.rsinvalidspreadsheetfile
+#, object-pascal-format
 msgid "\"%s\" is not a valid spreadsheet file"
 msgstr "\"%s\" ist keine gültige Spreadsheet-Datei"
 
 #: fpsstrings.rsinvalidworksheetname
+#, object-pascal-format
 msgid "\"%s\" is not a valid worksheet name."
 msgstr "\"%s\" ist kein gültiger Name für ein Arbeitsblatt."
 
 #: fpsstrings.rsleftbracketexpected
+#, object-pascal-format
 msgid "Expected left bracket at position %d, but got %s"
 msgstr "Linke Klammer erwartet an Position %d, aber %s gefunden"
 
 #: fpsstrings.rslocalfilehyperlinkabs
+#, object-pascal-format
 msgid "The hyperlink \"%s\" points to a local file. In case of an absolute path the protocol \"file:\" must be specified."
 msgstr "Der Hyperlink \"%s\" bezieht sich auf eine lokale Datei. Bei einem absoluten Pfad muss das Protokoll \"file:\" angegeben werden."
 
@@ -241,10 +273,12 @@ msgid "magenta"
 msgstr "magenta"
 
 #: fpsstrings.rsmaxcolsexceeded
+#, object-pascal-format
 msgid "This workbook contains %d columns, but the selected file format does not support more than %d columns."
 msgstr "Das Arbeitsbuch enthält %d Spalten, aber das ausgewählte Dateiformat unterstützt höchstens %d Spalten."
 
 #: fpsstrings.rsmaxrowsexceeded
+#, object-pascal-format
 msgid "This workbook contains %d rows, but the selected file format does not support more than %d rows."
 msgstr "Das Arbeitsbuch enthält %d Zeilen, aber das ausgewählte Dateiformat untersützt höchstens %d Zeilen."
 
@@ -253,10 +287,12 @@ msgid "Export to multiple sheets is possible only if position is restored."
 msgstr "Ein Export in mehrere Arbeitsblätter is nur dann möglich, wenn die Position wiederhergestellt wird."
 
 #: fpsstrings.rsnooperand
+#, object-pascal-format
 msgid "No operand for unary operation %s"
 msgstr "Kein Operand für die unäre Operation %s"
 
 #: fpsstrings.rsnopercentoperation
+#, object-pascal-format
 msgid "Cannot perform percent operation on expression of type %s: %s"
 msgstr "Prozent-Operation kann an dem Ausdruck vom Typ %s nicht ausgeführt werden: %s"
 
@@ -265,34 +301,43 @@ msgid "not defined"
 msgstr "Nicht definiert"
 
 #: fpsstrings.rsnovalidcelladdress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell address."
 msgstr "\"%s\" ist keine gültige Zell-Adresse."
 
 #: fpsstrings.rsnovalidcellrangeaddress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell range address."
 msgstr "\"%s\" ist keine gültige Adresse für einen Zellbereich."
 
 #: fpsstrings.rsnovalidcellrangeorcelladdress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell or cell range address."
 msgstr "\"%s\" ist keine gültige Adresse für eine Zelle oder einen Zellbereich."
 
 #: fpsstrings.rsnovalidhyperlinkinternal
+#, object-pascal-format
 msgid "The hyperlink \"%s\" is not a valid cell address."
 msgstr "Der Hyperlink \"%s\" bezieht sich auf keine gültige Zelladresse."
 
 #: fpsstrings.rsnovalidhyperlinkuri
+#, object-pascal-format
 msgid "The hyperlink \"%s\" is not a valid URI."
 msgstr "Der Hyperlink \"%s\" ist keine gültiger URI."
 
 #: fpsstrings.rsnovalidnumberformatstring
-msgid "No valid number format string."
+#, object-pascal-format, fuzzy, badformat
+#| msgid "No valid number format string."
+msgid "No valid number format string (%s)."
 msgstr "Kein gültiges Zahlenformat."
 
 #: fpsstrings.rsnovariable
+#, object-pascal-format
 msgid "Identifier %s is not a variable"
 msgstr "Der Bezeichner %s ist keine Variable"
 
 #: fpsstrings.rsodshyperlinksoftextcellsonly
+#, object-pascal-format
 msgid "Cell %s: OpenDocument supports hyperlinks for text cells only."
 msgstr "Zelle %s: Das OpenDocument-Format unterstützt Hyperlinks nur für Text-Zellen."
 
@@ -301,18 +346,22 @@ msgid "olive"
 msgstr "oliv"
 
 #: fpsstrings.rsonlyoneheaderfooterimageallowed
+#, object-pascal-format
 msgid "Only one image per %s section allowed."
 msgstr "Nur ein Bild ist erlaubt pro %s Abschnitt."
 
 #: fpsstrings.rsoperationexceedscolcount
+#, object-pascal-format
 msgid "This operation at index %d exceeds the range of defined grid columns (%d)."
 msgstr "Diese Operation bei Index %d überschreitet den Bereich der definierten Spalten (%d)."
 
 #: fpsstrings.rsoperationexceedsrowcount
+#, object-pascal-format
 msgid "This operation at index %d exceeds the range of defined grid rows (%d)."
 msgstr "Diese Operation bei Index %d überschreitet den Bereich der definierten Zeilen (%d)."
 
 #: fpsstrings.rspaletteindex
+#, object-pascal-format
 msgid "Palette index %d"
 msgstr "Palettenindex %d"
 
@@ -333,6 +382,7 @@ msgid "purple"
 msgstr "purpur"
 
 #: fpsstrings.rsreadernotfound
+#, object-pascal-format
 msgid "Reader not found for file \"%s\""
 msgstr "Lese-Prozedur nicht gefunden für Datei \"%s\""
 
@@ -341,10 +391,12 @@ msgid "red"
 msgstr "rot"
 
 #: fpsstrings.rsrightbracketexpected
+#, object-pascal-format
 msgid "Expected right bracket at position %d, but got %s"
 msgstr "Rechte Klammer erwartet an Position %d, aber %s gefunden"
 
 #: fpsstrings.rsrightsquarebracketexpected
+#, object-pascal-format
 msgid "Expected right square bracket at positon %d, but got %s"
 msgstr "Rechte eckige Klammer erwartet an Position %d, aber %s wurde gefunden"
 
@@ -365,6 +417,7 @@ msgid "teal"
 msgstr "blaugrün"
 
 #: fpsstrings.rstoomanypalettecolors
+#, object-pascal-format
 msgid "This workbook contains more colors (%d) than supported by the file format (%d). The additional colors are replaced by the best-matching palette colors."
 msgstr "Das Arbeitsbuch enthält mehr Farben (%d) als vom Dateiformat unterstützt (%d). Die zusätzlichen Farben werden durch ersetzt durch die nächsten Palettenfarben."
 
@@ -373,10 +426,12 @@ msgid "transparent"
 msgstr "transparent"
 
 #: fpsstrings.rstruncatetoolongcelltext
+#, object-pascal-format
 msgid "Text value exceeds the %d character limit in cell %s and has been truncated."
 msgstr "Der Text überschreitet die Grenze von %d Zeichen in Zelle %s und wurde abgeschnitten."
 
 #: fpsstrings.rstruncatetoolongtext
+#, object-pascal-format
 msgid "Text value exceeds the %d character limit and has been truncated."
 msgstr "Der Text ist länger als die Grenze bei %d Zeichen und wurde gekürzt."
 
@@ -385,6 +440,7 @@ msgid "Unexpected end of expression"
 msgstr "Unerwartetes Ende des Ausdrucks"
 
 #: fpsstrings.rsunknowncharacter
+#, object-pascal-format
 msgid "Unknown character at pos %d: \"%s\""
 msgstr "Unerwartetes Zeichen an Positon %d: \"%s\""
 
@@ -397,6 +453,7 @@ msgid "Unknown data type."
 msgstr "Unbekannter Datentyp."
 
 #: fpsstrings.rsunknowndelimiter
+#, object-pascal-format
 msgid "Unknown delimiter character: \"%s\""
 msgstr "Unbekanntes Trennzeichen: \"%s\""
 
@@ -405,10 +462,12 @@ msgid "Unknown error type."
 msgstr "Unbekannter Fehler-Typ."
 
 #: fpsstrings.rsunknownidentifier
+#, object-pascal-format
 msgid "Unknown identifier: %s"
 msgstr "Unbekannter Bezeichner: %s"
 
 #: fpsstrings.rsunknowntokenatpos
+#, object-pascal-format
 msgid "Unknown token at pos %d : %s"
 msgstr "Unbekanntes Symbol an Position %d: %s"
 
@@ -421,10 +480,12 @@ msgid "Tried to write a spreadsheet using an unsupported format"
 msgstr "Versuch eine Spreadsheet mit einem nicht unterstützten Format zu schreiben"
 
 #: fpsstrings.rsunterminatedexpression
+#, object-pascal-format
 msgid "Badly terminated expression. Found token at position %d : %s"
 msgstr "Schlecht terminierter Ausdruck. Symbol gefunden an Position %d : %s"
 
 #: fpsstrings.rsutf8textexpectedbutansifoundincell
+#, object-pascal-format
 msgid "Expected UTF8 text, but probably ANSI text found in cell %s."
 msgstr "In Zelle %s UTF8-Text erwartet, aber wahrscheinlich ANSI-Text gefunden."
 
@@ -433,6 +494,7 @@ msgid "white"
 msgstr "weiß"
 
 #: fpsstrings.rsworksheetnotfound
+#, object-pascal-format
 msgid "Worksheet \"%s\" not found."
 msgstr "Arbeitsblatt \"%s\" nicht gefunden."
 
@@ -441,6 +503,7 @@ msgid "Worksheet not found."
 msgstr "Arbeitsblatt nicht gefunden."
 
 #: fpsstrings.rswriteerror_worksheetnametoolong
+#, object-pascal-format
 msgid "File cannot be written because the name of worksheet \"%0:s\" is too long (max %1:d characters)."
 msgstr "Die Datei kann nicht geschrieben werden, weil der Name des Arbeitsblattes \"%0s:s\" zu lang ist (höchstens %1:d Zeichen)."
 
diff --git a/components/fpspreadsheet/languages/fpsstrings.fi.po b/components/fpspreadsheet/languages/fpsstrings.fi.po
index ed8596542..01c201861 100644
--- a/components/fpspreadsheet/languages/fpsstrings.fi.po
+++ b/components/fpspreadsheet/languages/fpsstrings.fi.po
@@ -10,6 +10,7 @@ msgid "All spreadsheet files"
 msgstr "Kaikki taulukkolaskenta tiedostot"
 
 #: fpsstrings.rsambiguousdecthouseparator
+#, object-pascal-format
 msgid "Assuming usage of decimal separator in \"%s\"."
 msgstr ""
 
@@ -26,6 +27,7 @@ msgid "blue"
 msgstr "sininen"
 
 #: fpsstrings.rscannotreadfile
+#, object-pascal-format
 msgid "Cannot read file \"%s\". Wrong, unknown or defective file format?"
 msgstr ""
 
@@ -34,10 +36,12 @@ msgid "The cell range cannot be sorted because it contains merged cells."
 msgstr ""
 
 #: fpsstrings.rscircularreference
+#, object-pascal-format
 msgid "Circular reference found when calculating worksheet formula in cell %s"
 msgstr ""
 
 #: fpsstrings.rscodepagenotsupported
+#, object-pascal-format
 msgid "Code page \"%s\" is not supported. Using \"cp1252\" (Latin 1) instead."
 msgstr "Merkistökoodisivua \"%s\" ei tueta. Käytetään \"cp1252\" (Latin 1) sen sijaan."
 
@@ -46,6 +50,7 @@ msgid "Column style not found."
 msgstr ""
 
 #: fpsstrings.rscommaexpected
+#, object-pascal-format
 msgid "Expected comma (,) at position %d, but got %s"
 msgstr "Odotettiin pilkkua (,) kohdassa %d mutta saatiin %s"
 
@@ -66,22 +71,27 @@ msgid "dark red"
 msgstr "tumman punainen"
 
 #: fpsstrings.rsdefaultsheetname
+#, object-pascal-format
 msgid "Sheet%d"
 msgstr "Sivu %d"
 
 #: fpsstrings.rsdefectiveinternalfilestructure
+#, object-pascal-format
 msgid "Defective internal structure of %s file."
 msgstr ""
 
 #: fpsstrings.rsdifferentsheetprintrange
+#, object-pascal-format
 msgid "Print range \"%s\" requires a different worksheet."
 msgstr ""
 
 #: fpsstrings.rsduplicateidentifier
+#, object-pascal-format
 msgid "An identifier with name \"%s\" already exists."
 msgstr ""
 
 #: fpsstrings.rsduplicateworksheetname
+#, object-pascal-format
 msgid "Duplicate worksheet \"%s\"."
 msgstr ""
 
@@ -102,14 +112,17 @@ msgid "Cannot evaluate: empty expression"
 msgstr ""
 
 #: fpsstrings.rsfilealreadyexists
+#, object-pascal-format
 msgid "File \"%s\" already exists."
 msgstr ""
 
 #: fpsstrings.rsfileformatnotsupported
+#, object-pascal-format
 msgid "File format of \"%s\" not supported."
 msgstr "Tiedostoformaattia \"%s\" ei ole tuettu"
 
 #: fpsstrings.rsfilenotfound
+#, object-pascal-format
 msgid "File \"%s\" not found."
 msgstr "Tiedostoa \"%s\" ei löydetty."
 
@@ -118,6 +131,7 @@ msgid "files"
 msgstr "tiedostot"
 
 #: fpsstrings.rsfilestructureerror
+#, object-pascal-format
 msgid "File structure error in %s record, position %d."
 msgstr ""
 
@@ -126,6 +140,7 @@ msgid "Footer"
 msgstr "Alatunniste"
 
 #: fpsstrings.rsformulanotsupported
+#, object-pascal-format
 msgid "The formula in cell %s is not supported by this file format: %s"
 msgstr "Laskentakaava solussa %s ei ole tuettu tässä tiedostoformaatissa: %s"
 
@@ -154,34 +169,42 @@ msgid "Image format not supported."
 msgstr "Kuvatiedostoformaattia ei ole tuettu"
 
 #: fpsstrings.rsincorrectpositionofimageinheaderfooter
+#, object-pascal-format
 msgid "Incorrect position of %%G code in %s"
 msgstr ""
 
 #: fpsstrings.rsindexinsstoutofrange
+#, object-pascal-format
 msgid "Index %d in SST out of range (0-%d)."
 msgstr ""
 
 #: fpsstrings.rsinvalidargumentcount
+#, object-pascal-format
 msgid "Invalid argument count for function %s"
 msgstr ""
 
 #: fpsstrings.rsinvalidcharacterincell
+#, object-pascal-format
 msgid "Invalid character(s) in cell %s."
 msgstr ""
 
 #: fpsstrings.rsinvalidcharacterincellcomment
+#, object-pascal-format
 msgid "Invalid character(s) in cell comment \"%s\"."
 msgstr ""
 
 #: fpsstrings.rsinvaliddatetimeformat
-msgid "Trying to use an incompatible date/time format."
+#, object-pascal-format
+msgid "Trying to use an incompatible date/time format (%s)."
 msgstr ""
 
 #: fpsstrings.rsinvalidextension
+#, object-pascal-format
 msgid "Attempting to save a spreadsheet by extension, but the extension %s is not valid."
 msgstr ""
 
 #: fpsstrings.rsinvalidfloat
+#, object-pascal-format
 msgid "%s is not a valid floating-point value"
 msgstr ""
 
@@ -190,10 +213,12 @@ msgid "Invalid font index"
 msgstr ""
 
 #: fpsstrings.rsinvalidnumber
+#, object-pascal-format
 msgid "Invalid numerical value : %s"
 msgstr ""
 
 #: fpsstrings.rsinvalidnumberchar
+#, object-pascal-format
 msgid "Unexpected character in number : %s"
 msgstr ""
 
@@ -202,26 +227,32 @@ msgid "Trying to use an incompatible number format."
 msgstr ""
 
 #: fpsstrings.rsinvalidresultcharacter
+#, object-pascal-format
 msgid "\"%s\" is not a valid return type indicator"
 msgstr ""
 
 #: fpsstrings.rsinvalidresulttype
+#, object-pascal-format
 msgid "Invalid result type: %s"
 msgstr ""
 
 #: fpsstrings.rsinvalidspreadsheetfile
+#, object-pascal-format
 msgid "\"%s\" is not a valid spreadsheet file"
 msgstr "\"%s\" ei ole sallittu taulukkolaskentatiedosto"
 
 #: fpsstrings.rsinvalidworksheetname
+#, object-pascal-format
 msgid "\"%s\" is not a valid worksheet name."
 msgstr ""
 
 #: fpsstrings.rsleftbracketexpected
+#, object-pascal-format
 msgid "Expected left bracket at position %d, but got %s"
 msgstr "Odotettiin vasenta suljetta kohdassa %d mutta saatiin %s"
 
 #: fpsstrings.rslocalfilehyperlinkabs
+#, object-pascal-format
 msgid "The hyperlink \"%s\" points to a local file. In case of an absolute path the protocol \"file:\" must be specified."
 msgstr ""
 
@@ -230,10 +261,12 @@ msgid "magenta"
 msgstr ""
 
 #: fpsstrings.rsmaxcolsexceeded
+#, object-pascal-format
 msgid "This workbook contains %d columns, but the selected file format does not support more than %d columns."
 msgstr "Tämä asiakirja sisältää %d saraketta, mutta valittu tiedostoformaatti ei tue enempää kuin %d saraketta."
 
 #: fpsstrings.rsmaxrowsexceeded
+#, object-pascal-format
 msgid "This workbook contains %d rows, but the selected file format does not support more than %d rows."
 msgstr "Tämä asiakirja sisältää %d riviä, mutta valittu tiedostoformaatti ei tue enempää kuin %d riviä."
 
@@ -242,10 +275,12 @@ msgid "Export to multiple sheets is possible only if position is restored."
 msgstr ""
 
 #: fpsstrings.rsnooperand
+#, object-pascal-format
 msgid "No operand for unary operation %s"
 msgstr ""
 
 #: fpsstrings.rsnopercentoperation
+#, object-pascal-format
 msgid "Cannot perform percent operation on expression of type %s: %s"
 msgstr ""
 
@@ -254,34 +289,42 @@ msgid "not defined"
 msgstr "ei määritelty"
 
 #: fpsstrings.rsnovalidcelladdress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell address."
 msgstr "\"%s\" ei ole sallittu soluosoite."
 
 #: fpsstrings.rsnovalidcellrangeaddress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell range address."
 msgstr ""
 
 #: fpsstrings.rsnovalidcellrangeorcelladdress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell or cell range address."
 msgstr ""
 
 #: fpsstrings.rsnovalidhyperlinkinternal
+#, object-pascal-format
 msgid "The hyperlink \"%s\" is not a valid cell address."
 msgstr ""
 
 #: fpsstrings.rsnovalidhyperlinkuri
+#, object-pascal-format
 msgid "The hyperlink \"%s\" is not a valid URI."
 msgstr ""
 
 #: fpsstrings.rsnovalidnumberformatstring
-msgid "No valid number format string."
+#, object-pascal-format
+msgid "No valid number format string (%s)."
 msgstr ""
 
 #: fpsstrings.rsnovariable
+#, object-pascal-format
 msgid "Identifier %s is not a variable"
 msgstr "Tunniste %s ei ole muuttuja"
 
 #: fpsstrings.rsodshyperlinksoftextcellsonly
+#, object-pascal-format
 msgid "Cell %s: OpenDocument supports hyperlinks for text cells only."
 msgstr "Solu %s: OpenDocument tukee hyperlinkkejä ainoastaan tekstisoluissa"
 
@@ -290,18 +333,22 @@ msgid "olive"
 msgstr "oliivi"
 
 #: fpsstrings.rsonlyoneheaderfooterimageallowed
+#, object-pascal-format
 msgid "Only one image per %s section allowed."
 msgstr ""
 
 #: fpsstrings.rsoperationexceedscolcount
+#, object-pascal-format
 msgid "This operation at index %d exceeds the range of defined grid columns (%d)."
 msgstr ""
 
 #: fpsstrings.rsoperationexceedsrowcount
+#, object-pascal-format
 msgid "This operation at index %d exceeds the range of defined grid rows (%d)."
 msgstr ""
 
 #: fpsstrings.rspaletteindex
+#, object-pascal-format
 msgid "Palette index %d"
 msgstr ""
 
@@ -322,6 +369,7 @@ msgid "purple"
 msgstr ""
 
 #: fpsstrings.rsreadernotfound
+#, object-pascal-format
 msgid "Reader not found for file \"%s\""
 msgstr ""
 
@@ -330,10 +378,12 @@ msgid "red"
 msgstr "punainen"
 
 #: fpsstrings.rsrightbracketexpected
+#, object-pascal-format
 msgid "Expected right bracket at position %d, but got %s"
 msgstr "Odotettiin oikeata suljetta kohdassa %d mutta saatiin %s"
 
 #: fpsstrings.rsrightsquarebracketexpected
+#, object-pascal-format
 msgid "Expected right square bracket at positon %d, but got %s"
 msgstr ""
 
@@ -354,6 +404,7 @@ msgid "teal"
 msgstr ""
 
 #: fpsstrings.rstoomanypalettecolors
+#, object-pascal-format
 msgid "This workbook contains more colors (%d) than supported by the file format (%d). The additional colors are replaced by the best-matching palette colors."
 msgstr "Tämä asiakirja sisältää enemmän värejä (%d) kuin  on tuettuna fiedostohormaatissa (%d). Ylimääräiset värit on korvattu parhaalla mahdollisella väripaletin värillä."
 
@@ -362,10 +413,12 @@ msgid "transparent"
 msgstr "läpinäkyvä"
 
 #: fpsstrings.rstruncatetoolongcelltext
+#, object-pascal-format
 msgid "Text value exceeds the %d character limit in cell %s and has been truncated."
 msgstr ""
 
 #: fpsstrings.rstruncatetoolongtext
+#, object-pascal-format
 msgid "Text value exceeds the %d character limit and has been truncated."
 msgstr ""
 
@@ -374,6 +427,7 @@ msgid "Unexpected end of expression"
 msgstr ""
 
 #: fpsstrings.rsunknowncharacter
+#, object-pascal-format
 msgid "Unknown character at pos %d: \"%s\""
 msgstr ""
 
@@ -386,6 +440,7 @@ msgid "Unknown data type."
 msgstr "Tuntematon datatyyppi"
 
 #: fpsstrings.rsunknowndelimiter
+#, object-pascal-format
 msgid "Unknown delimiter character: \"%s\""
 msgstr ""
 
@@ -394,10 +449,12 @@ msgid "Unknown error type."
 msgstr ""
 
 #: fpsstrings.rsunknownidentifier
+#, object-pascal-format
 msgid "Unknown identifier: %s"
 msgstr ""
 
 #: fpsstrings.rsunknowntokenatpos
+#, object-pascal-format
 msgid "Unknown token at pos %d : %s"
 msgstr ""
 
@@ -410,10 +467,12 @@ msgid "Tried to write a spreadsheet using an unsupported format"
 msgstr ""
 
 #: fpsstrings.rsunterminatedexpression
+#, object-pascal-format
 msgid "Badly terminated expression. Found token at position %d : %s"
 msgstr ""
 
 #: fpsstrings.rsutf8textexpectedbutansifoundincell
+#, object-pascal-format
 msgid "Expected UTF8 text, but probably ANSI text found in cell %s."
 msgstr "Oletettiin UTF8 tekstikoodausta mutta luultavasti löydettiin ANSI koodattua tekstiä solussa %s."
 
@@ -422,6 +481,7 @@ msgid "white"
 msgstr "valkoinen"
 
 #: fpsstrings.rsworksheetnotfound
+#, object-pascal-format
 msgid "Worksheet \"%s\" not found."
 msgstr ""
 
@@ -430,6 +490,7 @@ msgid "Worksheet not found."
 msgstr ""
 
 #: fpsstrings.rswriteerror_worksheetnametoolong
+#, object-pascal-format
 msgid "File cannot be written because the name of worksheet \"%0:s\" is too long (max %1:d characters)."
 msgstr ""
 
diff --git a/components/fpspreadsheet/languages/fpsstrings.hu.po b/components/fpspreadsheet/languages/fpsstrings.hu.po
index 8a67d0778..744b30981 100644
--- a/components/fpspreadsheet/languages/fpsstrings.hu.po
+++ b/components/fpspreadsheet/languages/fpsstrings.hu.po
@@ -20,6 +20,7 @@ msgid "All spreadsheet files"
 msgstr "Minden táblázat fájl"
 
 #: fpsstrings.rsambiguousdecthouseparator
+#, object-pascal-format
 msgid "Assuming usage of decimal separator in \"%s\"."
 msgstr "Tizedeselválasztó használata feltételezve ebben: \"%s\"."
 
@@ -36,6 +37,7 @@ msgid "blue"
 msgstr "kék"
 
 #: fpsstrings.rscannotreadfile
+#, object-pascal-format
 msgid "Cannot read file \"%s\". Wrong, unknown or defective file format?"
 msgstr "A(z) \"%s\" fájl nem olvasható. Rossz, ismeretlen formátumú vagy sérült a fájl?"
 
@@ -44,10 +46,12 @@ msgid "The cell range cannot be sorted because it contains merged cells."
 msgstr "A cellatartomány nem rendezhető sorba, mert összevont cellákat tartalaz."
 
 #: fpsstrings.rscircularreference
+#, object-pascal-format
 msgid "Circular reference found when calculating worksheet formula in cell %s"
 msgstr "Körkörös hivatkozás érzékelve a(z) %s cellában található munkalap-formula kiszámításakor."
 
 #: fpsstrings.rscodepagenotsupported
+#, object-pascal-format
 msgid "Code page \"%s\" is not supported. Using \"cp1252\" (Latin 1) instead."
 msgstr "A(z) \"%s\" kódlap nincs támogatva, helyette a \"cp1252\" (Latin1) lesz használva."
 
@@ -56,6 +60,7 @@ msgid "Column style not found."
 msgstr "Oszlop stílus nem található."
 
 #: fpsstrings.rscommaexpected
+#, object-pascal-format
 msgid "Expected comma (,) at position %d, but got %s"
 msgstr "Vessző (,) szükséges a(z) %d. pozícióban, de %s található"
 
@@ -76,22 +81,27 @@ msgid "dark red"
 msgstr "sötétvörös"
 
 #: fpsstrings.rsdefaultsheetname
+#, object-pascal-format
 msgid "Sheet%d"
 msgstr "Lap%d"
 
 #: fpsstrings.rsdefectiveinternalfilestructure
+#, object-pascal-format
 msgid "Defective internal structure of %s file."
 msgstr "A(z) %s fájl belső szerkezete sérült."
 
 #: fpsstrings.rsdifferentsheetprintrange
+#, object-pascal-format
 msgid "Print range \"%s\" requires a different worksheet."
 msgstr "A(z) \"%s\" nyomtatási tartományhoz szükség van egy másik munkalapra."
 
 #: fpsstrings.rsduplicateidentifier
+#, object-pascal-format
 msgid "An identifier with name \"%s\" already exists."
 msgstr "Már létezik egy azonosító \"%s\" névvel."
 
 #: fpsstrings.rsduplicateworksheetname
+#, object-pascal-format
 msgid "Duplicate worksheet \"%s\"."
 msgstr ""
 
@@ -112,14 +122,17 @@ msgid "Cannot evaluate: empty expression"
 msgstr "Kiértékelhetetlen: üres kifejezés"
 
 #: fpsstrings.rsfilealreadyexists
+#, object-pascal-format
 msgid "File \"%s\" already exists."
 msgstr "A(z) \"%s\" fájl már létezik."
 
 #: fpsstrings.rsfileformatnotsupported
+#, object-pascal-format
 msgid "File format of \"%s\" not supported."
 msgstr "A(z) \"%s\" fájl formátuma nincs támogatva."
 
 #: fpsstrings.rsfilenotfound
+#, object-pascal-format
 msgid "File \"%s\" not found."
 msgstr "A(z) \"%s\" fájl nem található."
 
@@ -128,6 +141,7 @@ msgid "files"
 msgstr "fájl"
 
 #: fpsstrings.rsfilestructureerror
+#, object-pascal-format
 msgid "File structure error in %s record, position %d."
 msgstr "Fájl szerkezeti hiba a(z) %s rekord %d. pozíciójában."
 
@@ -136,6 +150,7 @@ msgid "Footer"
 msgstr "Lábléc"
 
 #: fpsstrings.rsformulanotsupported
+#, object-pascal-format
 msgid "The formula in cell %s is not supported by this file format: %s"
 msgstr "A(z) %s cellában megadott formula nincs támogatva ezen fájltípusban: %s"
 
@@ -164,34 +179,43 @@ msgid "Image format not supported."
 msgstr "A kép formátuma nincs támogatva."
 
 #: fpsstrings.rsincorrectpositionofimageinheaderfooter
+#, object-pascal-format
 msgid "Incorrect position of %%G code in %s"
 msgstr "A %%G kód pozíciója érvénytelen ebben: %s"
 
 #: fpsstrings.rsindexinsstoutofrange
+#, object-pascal-format
 msgid "Index %d in SST out of range (0-%d)."
 msgstr "A(z) %d index az SST-ben kívül esik az érvényes tartományon (0-%d)."
 
 #: fpsstrings.rsinvalidargumentcount
+#, object-pascal-format
 msgid "Invalid argument count for function %s"
 msgstr "Az argumentumok száma nem megfelelő a(z) %s függvény számára"
 
 #: fpsstrings.rsinvalidcharacterincell
+#, object-pascal-format
 msgid "Invalid character(s) in cell %s."
 msgstr "Érvénytelen karakter(ek) a(z) %s cellában."
 
 #: fpsstrings.rsinvalidcharacterincellcomment
+#, object-pascal-format
 msgid "Invalid character(s) in cell comment \"%s\"."
 msgstr "Érvénytelen karakter(ek) a(z) %s cella megjegyzésében."
 
 #: fpsstrings.rsinvaliddatetimeformat
-msgid "Trying to use an incompatible date/time format."
+#, object-pascal-format, fuzzy, badformat
+#| msgid "Trying to use an incompatible date/time format."
+msgid "Trying to use an incompatible date/time format (%s)."
 msgstr "Kísérlet össze nem egyeztethető dátum/idő formátum használatára."
 
 #: fpsstrings.rsinvalidextension
+#, object-pascal-format
 msgid "Attempting to save a spreadsheet by extension, but the extension %s is not valid."
 msgstr "Kísérlet a táblázat kiterjesztés alapján történő mentésére, de a(z) %s nem érvényes kiterjesztés."
 
 #: fpsstrings.rsinvalidfloat
+#, object-pascal-format
 msgid "%s is not a valid floating-point value"
 msgstr "A(z) %s nem érvényes lebegőpontos érték"
 
@@ -200,10 +224,12 @@ msgid "Invalid font index"
 msgstr "Érvénytelen betűkészlet index"
 
 #: fpsstrings.rsinvalidnumber
+#, object-pascal-format
 msgid "Invalid numerical value : %s"
 msgstr "Érvénytelen számérték: %s"
 
 #: fpsstrings.rsinvalidnumberchar
+#, object-pascal-format
 msgid "Unexpected character in number : %s"
 msgstr "Váratlan, számként nem értelmezhető karakter: %s"
 
@@ -212,26 +238,32 @@ msgid "Trying to use an incompatible number format."
 msgstr "Kísérlet össze nem egyeztethető szám formátum használatára."
 
 #: fpsstrings.rsinvalidresultcharacter
+#, object-pascal-format
 msgid "\"%s\" is not a valid return type indicator"
 msgstr "A(z) \"%s\" nem érvényes visszatérési típus jelző."
 
 #: fpsstrings.rsinvalidresulttype
+#, object-pascal-format
 msgid "Invalid result type: %s"
 msgstr "Érvénytelen visszaadott típus: %s"
 
 #: fpsstrings.rsinvalidspreadsheetfile
+#, object-pascal-format
 msgid "\"%s\" is not a valid spreadsheet file"
 msgstr "A(z) \"%s\" nem érvényes táblázatfájl."
 
 #: fpsstrings.rsinvalidworksheetname
+#, object-pascal-format
 msgid "\"%s\" is not a valid worksheet name."
 msgstr "A(z) \"%s\" nem érvényes munkalapnév."
 
 #: fpsstrings.rsleftbracketexpected
+#, object-pascal-format
 msgid "Expected left bracket at position %d, but got %s"
 msgstr "Bal oldali zárójel szükséges a(z) %d. pozícióban, de %s található"
 
 #: fpsstrings.rslocalfilehyperlinkabs
+#, object-pascal-format
 msgid "The hyperlink \"%s\" points to a local file. In case of an absolute path the protocol \"file:\" must be specified."
 msgstr "A(z) \"%s\" hiperhivatkozás egy helyi fájlra mutat. Abszolút útvonal esetén a \"file:\" protokollazonosítót meg kell adni."
 
@@ -240,10 +272,12 @@ msgid "magenta"
 msgstr "lila"
 
 #: fpsstrings.rsmaxcolsexceeded
+#, object-pascal-format
 msgid "This workbook contains %d columns, but the selected file format does not support more than %d columns."
 msgstr "Ez a munkafüzet %d oszlopot tartalmaz, de a kiválasztott fájlformátum nem támogat %d oszlopnál többet."
 
 #: fpsstrings.rsmaxrowsexceeded
+#, object-pascal-format
 msgid "This workbook contains %d rows, but the selected file format does not support more than %d rows."
 msgstr "Ez a munkafüzet %d sort tartalmaz, de a kiválasztott fájlformátum nem támogat %d sornál többet."
 
@@ -252,10 +286,12 @@ msgid "Export to multiple sheets is possible only if position is restored."
 msgstr "A több lapra történő exportálás csak a pozíció visszaállítása esetén lehetséges."
 
 #: fpsstrings.rsnooperand
+#, object-pascal-format
 msgid "No operand for unary operation %s"
 msgstr "Nincs adat az egytényezős %s művelet számára"
 
 #: fpsstrings.rsnopercentoperation
+#, object-pascal-format
 msgid "Cannot perform percent operation on expression of type %s: %s"
 msgstr "Nem lehet elvégezni %s típusú kifejezésen a százalékszámítást: %s"
 
@@ -264,34 +300,43 @@ msgid "not defined"
 msgstr "nincs megadva"
 
 #: fpsstrings.rsnovalidcelladdress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell address."
 msgstr "A(z) \"%s\" nem érvényes cella cím."
 
 #: fpsstrings.rsnovalidcellrangeaddress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell range address."
 msgstr "A(z) \"%s\" nem érvényes cellatartomány cím."
 
 #: fpsstrings.rsnovalidcellrangeorcelladdress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell or cell range address."
 msgstr "A(z) \"%s\" nem érvényes cella vagy cellatartomány cím."
 
 #: fpsstrings.rsnovalidhyperlinkinternal
+#, object-pascal-format
 msgid "The hyperlink \"%s\" is not a valid cell address."
 msgstr "A(z) \"%s\" hiperhivatkozás nem érvényes cellacím."
 
 #: fpsstrings.rsnovalidhyperlinkuri
+#, object-pascal-format
 msgid "The hyperlink \"%s\" is not a valid URI."
 msgstr "A(z) \"%s\" hiperhivatkozás nem érvényes URI."
 
 #: fpsstrings.rsnovalidnumberformatstring
-msgid "No valid number format string."
+#, object-pascal-format, fuzzy, badformat
+#| msgid "No valid number format string."
+msgid "No valid number format string (%s)."
 msgstr "Nincs érvényes számformázó karakterlánc."
 
 #: fpsstrings.rsnovariable
+#, object-pascal-format
 msgid "Identifier %s is not a variable"
 msgstr "Az azonosító nem egy változó: %s"
 
 #: fpsstrings.rsodshyperlinksoftextcellsonly
+#, object-pascal-format
 msgid "Cell %s: OpenDocument supports hyperlinks for text cells only."
 msgstr "%s cella: az OpenDocument formátum csak szövegcellákban támogatja a hiperhivatkozásokat."
 
@@ -300,22 +345,24 @@ msgid "olive"
 msgstr "olíva"
 
 #: fpsstrings.rsonlyoneheaderfooterimageallowed
+#, object-pascal-format
 msgid "Only one image per %s section allowed."
 msgstr "Csak egy kép lehet %s szakaszonként."
 
 #: fpsstrings.rsoperationexceedscolcount
-#, fuzzy,badformat
+#, object-pascal-format, fuzzy, badformat
 #| msgid "This operation exceeds the range of defined grid columns."
 msgid "This operation at index %d exceeds the range of defined grid columns (%d)."
 msgstr "A művelet túllépi a rács oszlopainak tartományát."
 
 #: fpsstrings.rsoperationexceedsrowcount
-#, fuzzy,badformat
+#, object-pascal-format, fuzzy, badformat
 #| msgid "This operation exceeds the range of defined grid rows."
 msgid "This operation at index %d exceeds the range of defined grid rows (%d)."
 msgstr "A művelet túllépi a rács sorainak tartományát."
 
 #: fpsstrings.rspaletteindex
+#, object-pascal-format
 msgid "Palette index %d"
 msgstr "Paletta index: %d"
 
@@ -336,6 +383,7 @@ msgid "purple"
 msgstr "bíbor"
 
 #: fpsstrings.rsreadernotfound
+#, object-pascal-format
 msgid "Reader not found for file \"%s\""
 msgstr "Nem található olvasó a(z) \"%s\" fájlhoz."
 
@@ -344,10 +392,12 @@ msgid "red"
 msgstr "piros"
 
 #: fpsstrings.rsrightbracketexpected
+#, object-pascal-format
 msgid "Expected right bracket at position %d, but got %s"
 msgstr "Jobb oldali zárójel szükséges a(z) %d. pozícióban, de %s található"
 
 #: fpsstrings.rsrightsquarebracketexpected
+#, object-pascal-format
 msgid "Expected right square bracket at positon %d, but got %s"
 msgstr ""
 
@@ -368,6 +418,7 @@ msgid "teal"
 msgstr "kékeszöld"
 
 #: fpsstrings.rstoomanypalettecolors
+#, object-pascal-format
 msgid "This workbook contains more colors (%d) than supported by the file format (%d). The additional colors are replaced by the best-matching palette colors."
 msgstr "Ez a munkafüzet több színt (%d) tartalmaz, mint amennyit a fájl formátuma támogat (%d). A hozzáadott színek le lettek cserélve a paletta legjobban hasonlító színére."
 
@@ -376,11 +427,12 @@ msgid "transparent"
 msgstr "átlátszó"
 
 #: fpsstrings.rstruncatetoolongcelltext
-#, fuzzy,badformat
+#, object-pascal-format, fuzzy, badformat
 msgid "Text value exceeds the %d character limit in cell %s and has been truncated."
 msgstr "A szöveg hosszabb mint a(z) 15 karakteres korlát a(z) %s cellában, ezért csonkolva lett."
 
 #: fpsstrings.rstruncatetoolongtext
+#, object-pascal-format
 msgid "Text value exceeds the %d character limit and has been truncated."
 msgstr ""
 
@@ -389,6 +441,7 @@ msgid "Unexpected end of expression"
 msgstr "A kifejezés váratlanul ért véget"
 
 #: fpsstrings.rsunknowncharacter
+#, object-pascal-format
 msgid "Unknown character at pos %d: \"%s\""
 msgstr "A(z) %d karakter ismeretlen: \"%s\""
 
@@ -401,6 +454,7 @@ msgid "Unknown data type."
 msgstr "Ismeretlen adattípus."
 
 #: fpsstrings.rsunknowndelimiter
+#, object-pascal-format
 msgid "Unknown delimiter character: \"%s\""
 msgstr "Ismeretlen határoló karakter: \"%s\""
 
@@ -409,10 +463,12 @@ msgid "Unknown error type."
 msgstr "Ismeretlen hibatípus."
 
 #: fpsstrings.rsunknownidentifier
+#, object-pascal-format
 msgid "Unknown identifier: %s"
 msgstr "Ismeretlen azonosító: %s"
 
 #: fpsstrings.rsunknowntokenatpos
+#, object-pascal-format
 msgid "Unknown token at pos %d : %s"
 msgstr "A(z) %d. token ismeretlen: %s"
 
@@ -425,10 +481,12 @@ msgid "Tried to write a spreadsheet using an unsupported format"
 msgstr "Kísérlet történt egy ismeretlen formátumú táblázat írására"
 
 #: fpsstrings.rsunterminatedexpression
+#, object-pascal-format
 msgid "Badly terminated expression. Found token at position %d : %s"
 msgstr "Rosszul lezárt kifejezés. A(z) %d. token: %s "
 
 #: fpsstrings.rsutf8textexpectedbutansifoundincell
+#, object-pascal-format
 msgid "Expected UTF8 text, but probably ANSI text found in cell %s."
 msgstr "UTF8 szöveg az elvárt, de valószínűleg ANSI szöveg található a(z) %s cellában."
 
@@ -437,6 +495,7 @@ msgid "white"
 msgstr "fehér"
 
 #: fpsstrings.rsworksheetnotfound
+#, object-pascal-format
 msgid "Worksheet \"%s\" not found."
 msgstr "A(z) \"%s\" munkalap nem található."
 
@@ -445,6 +504,7 @@ msgid "Worksheet not found."
 msgstr "A munkalap nem található."
 
 #: fpsstrings.rswriteerror_worksheetnametoolong
+#, object-pascal-format
 msgid "File cannot be written because the name of worksheet \"%0:s\" is too long (max %1:d characters)."
 msgstr ""
 
diff --git a/components/fpspreadsheet/languages/fpsstrings.po b/components/fpspreadsheet/languages/fpsstrings.po
index 6771e4803..94bca41f8 100644
--- a/components/fpspreadsheet/languages/fpsstrings.po
+++ b/components/fpspreadsheet/languages/fpsstrings.po
@@ -174,7 +174,7 @@ msgid "Invalid character(s) in cell comment \"%s\"."
 msgstr ""
 
 #: fpsstrings.rsinvaliddatetimeformat
-msgid "Trying to use an incompatible date/time format."
+msgid "Trying to use an incompatible date/time format (%s)."
 msgstr ""
 
 #: fpsstrings.rsinvalidextension
@@ -274,7 +274,7 @@ msgid "The hyperlink \"%s\" is not a valid URI."
 msgstr ""
 
 #: fpsstrings.rsnovalidnumberformatstring
-msgid "No valid number format string."
+msgid "No valid number format string (%s)."
 msgstr ""
 
 #: fpsstrings.rsnovariable
diff --git a/components/fpspreadsheet/languages/fpsstrings.ru.po b/components/fpspreadsheet/languages/fpsstrings.ru.po
index dd4f595fa..2eae62977 100644
--- a/components/fpspreadsheet/languages/fpsstrings.ru.po
+++ b/components/fpspreadsheet/languages/fpsstrings.ru.po
@@ -10,6 +10,7 @@ msgid "All spreadsheet files"
 msgstr "Все файлы электронных таблиц"
 
 #: fpsstrings.rsambiguousdecthouseparator
+#, object-pascal-format
 msgid "Assuming usage of decimal separator in \"%s\"."
 msgstr "Предпологается использование десятичного разеделителя в \"%s\"."
 
@@ -26,6 +27,7 @@ msgid "blue"
 msgstr "голубой"
 
 #: fpsstrings.rscannotreadfile
+#, object-pascal-format
 msgid "Cannot read file \"%s\". Wrong, unknown or defective file format?"
 msgstr "Ошибка чтения файла \"%s\". Файл повреждён либо неизвестный формат файла?"
 
@@ -34,10 +36,12 @@ msgid "The cell range cannot be sorted because it contains merged cells."
 msgstr "Нельзя сортировать диапазон ячеек, поскольку он содержит объединённые ячейки"
 
 #: fpsstrings.rscircularreference
+#, object-pascal-format
 msgid "Circular reference found when calculating worksheet formula in cell %s"
 msgstr "Циклическая ссылка найдена при подсчёте формулы в ячейке %s"
 
 #: fpsstrings.rscodepagenotsupported
+#, object-pascal-format
 msgid "Code page \"%s\" is not supported. Using \"cp1252\" (Latin 1) instead."
 msgstr "Кодовая страница \"%s\" не поддерживается. Используем \"cp1252\" (Latin 1) по умолчанию."
 
@@ -46,6 +50,7 @@ msgid "Column style not found."
 msgstr "Стиль столбца не найден."
 
 #: fpsstrings.rscommaexpected
+#, object-pascal-format
 msgid "Expected comma (,) at position %d, but got %s"
 msgstr "Ожидайется запятая (,) в позиции %d, но найдено %s"
 
@@ -66,22 +71,27 @@ msgid "dark red"
 msgstr "тёмно-красный"
 
 #: fpsstrings.rsdefaultsheetname
+#, object-pascal-format
 msgid "Sheet%d"
 msgstr "Лист%d"
 
 #: fpsstrings.rsdefectiveinternalfilestructure
+#, object-pascal-format
 msgid "Defective internal structure of %s file."
 msgstr "Повреждённая внутренняя структура файла %s."
 
 #: fpsstrings.rsdifferentsheetprintrange
+#, object-pascal-format
 msgid "Print range \"%s\" requires a different worksheet."
 msgstr "Диапазон печати \"%s\" требует раличных таблиц."
 
 #: fpsstrings.rsduplicateidentifier
+#, object-pascal-format
 msgid "An identifier with name \"%s\" already exists."
 msgstr "Переменная с именем \"%s\" уже существует."
 
 #: fpsstrings.rsduplicateworksheetname
+#, object-pascal-format
 msgid "Duplicate worksheet \"%s\"."
 msgstr ""
 
@@ -102,14 +112,17 @@ msgid "Cannot evaluate: empty expression"
 msgstr "Расчёт не возможен: пустое выражение"
 
 #: fpsstrings.rsfilealreadyexists
+#, object-pascal-format
 msgid "File \"%s\" already exists."
 msgstr "Файл \"%s\" уже существует."
 
 #: fpsstrings.rsfileformatnotsupported
+#, object-pascal-format
 msgid "File format of \"%s\" not supported."
 msgstr "Не поддерживаемый форма файла \"%s\"."
 
 #: fpsstrings.rsfilenotfound
+#, object-pascal-format
 msgid "File \"%s\" not found."
 msgstr "Файл \"%s\" не найден."
 
@@ -118,6 +131,7 @@ msgid "files"
 msgstr "файлы"
 
 #: fpsstrings.rsfilestructureerror
+#, object-pascal-format
 msgid "File structure error in %s record, position %d."
 msgstr "Ошибка структуры файла в %s записе, позиция %d."
 
@@ -126,6 +140,7 @@ msgid "Footer"
 msgstr "Итог"
 
 #: fpsstrings.rsformulanotsupported
+#, object-pascal-format
 msgid "The formula in cell %s is not supported by this file format: %s"
 msgstr "Формула в ячейке %s не поддерживается форматом файла: %s"
 
@@ -154,34 +169,43 @@ msgid "Image format not supported."
 msgstr "Формат изображения не поддерживается"
 
 #: fpsstrings.rsincorrectpositionofimageinheaderfooter
+#, object-pascal-format
 msgid "Incorrect position of %%G code in %s"
 msgstr "Неверная позиция %%G кода в %s"
 
 #: fpsstrings.rsindexinsstoutofrange
+#, object-pascal-format
 msgid "Index %d in SST out of range (0-%d)."
 msgstr "Индекс %d в SST выходит за пределы диапазона (0-%d)."
 
 #: fpsstrings.rsinvalidargumentcount
+#, object-pascal-format
 msgid "Invalid argument count for function %s"
 msgstr "Не верный аргумент для функции %s"
 
 #: fpsstrings.rsinvalidcharacterincell
+#, object-pascal-format
 msgid "Invalid character(s) in cell %s."
 msgstr "Не верные символ(ы) в ячейке %s."
 
 #: fpsstrings.rsinvalidcharacterincellcomment
+#, object-pascal-format
 msgid "Invalid character(s) in cell comment \"%s\"."
 msgstr "Не верные символ(ы) в коментарии к ячейке \"%s\"."
 
 #: fpsstrings.rsinvaliddatetimeformat
-msgid "Trying to use an incompatible date/time format."
+#, object-pascal-format, fuzzy, badformat
+#| msgid "Trying to use an incompatible date/time format."
+msgid "Trying to use an incompatible date/time format (%s)."
 msgstr "Попытка использования не определённого формата даты/времени."
 
 #: fpsstrings.rsinvalidextension
+#, object-pascal-format
 msgid "Attempting to save a spreadsheet by extension, but the extension %s is not valid."
 msgstr "Попытка определения формата таблицы при сохранения по расширению файла, но расширение %s не верно."
 
 #: fpsstrings.rsinvalidfloat
+#, object-pascal-format
 msgid "%s is not a valid floating-point value"
 msgstr "Не верное значение %s для вещественного числа"
 
@@ -190,10 +214,12 @@ msgid "Invalid font index"
 msgstr "Ошибка индекса шрифта"
 
 #: fpsstrings.rsinvalidnumber
+#, object-pascal-format
 msgid "Invalid numerical value : %s"
 msgstr "Ошибка в числовом значении : %s"
 
 #: fpsstrings.rsinvalidnumberchar
+#, object-pascal-format
 msgid "Unexpected character in number : %s"
 msgstr "Отсутсвует символ в числе : %s"
 
@@ -202,26 +228,32 @@ msgid "Trying to use an incompatible number format."
 msgstr "Попытка использования не соместимого формата числа"
 
 #: fpsstrings.rsinvalidresultcharacter
+#, object-pascal-format
 msgid "\"%s\" is not a valid return type indicator"
 msgstr ""
 
 #: fpsstrings.rsinvalidresulttype
+#, object-pascal-format
 msgid "Invalid result type: %s"
 msgstr "Не верный результирующий тип: %s"
 
 #: fpsstrings.rsinvalidspreadsheetfile
+#, object-pascal-format
 msgid "\"%s\" is not a valid spreadsheet file"
 msgstr "\"%s\" не верный файл электронной таблицы"
 
 #: fpsstrings.rsinvalidworksheetname
+#, object-pascal-format
 msgid "\"%s\" is not a valid worksheet name."
 msgstr "\"%s\" не верное имя таблицы."
 
 #: fpsstrings.rsleftbracketexpected
+#, object-pascal-format
 msgid "Expected left bracket at position %d, but got %s"
 msgstr "Ожидается левая скобка в позиции %d, но найдено %s"
 
 #: fpsstrings.rslocalfilehyperlinkabs
+#, object-pascal-format
 msgid "The hyperlink \"%s\" points to a local file. In case of an absolute path the protocol \"file:\" must be specified."
 msgstr "Гиперссылка \"%s\" указывает на локальный файл. Необходимо указать протокол \"file:\"."
 
@@ -230,10 +262,12 @@ msgid "magenta"
 msgstr "фуксин"
 
 #: fpsstrings.rsmaxcolsexceeded
+#, object-pascal-format
 msgid "This workbook contains %d columns, but the selected file format does not support more than %d columns."
 msgstr "Таблица содержит %d столбцов, но указанный форма не поодерживает более %d столбцов."
 
 #: fpsstrings.rsmaxrowsexceeded
+#, object-pascal-format
 msgid "This workbook contains %d rows, but the selected file format does not support more than %d rows."
 msgstr "Таблица содержит %d строк, но указанный форма не поддерживает более %d строк."
 
@@ -242,10 +276,12 @@ msgid "Export to multiple sheets is possible only if position is restored."
 msgstr "Экспорт в несколько листов возможен только в случае если позиция восстанавливается."
 
 #: fpsstrings.rsnooperand
+#, object-pascal-format
 msgid "No operand for unary operation %s"
 msgstr "Не указан операнд для унарной операции %s"
 
 #: fpsstrings.rsnopercentoperation
+#, object-pascal-format
 msgid "Cannot perform percent operation on expression of type %s: %s"
 msgstr "Не возможно выполнить операцию процента в выражении типа %s: %s"
 
@@ -254,34 +290,43 @@ msgid "not defined"
 msgstr "не определено"
 
 #: fpsstrings.rsnovalidcelladdress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell address."
 msgstr "\"%s\" не верный адрес ячейки."
 
 #: fpsstrings.rsnovalidcellrangeaddress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell range address."
 msgstr "\"%s\" не верный адрес диапазона ячеек."
 
 #: fpsstrings.rsnovalidcellrangeorcelladdress
+#, object-pascal-format
 msgid "\"%s\" is not a valid cell or cell range address."
 msgstr "\"%s\" не верный адрес для чейки или диапазона ячеек."
 
 #: fpsstrings.rsnovalidhyperlinkinternal
+#, object-pascal-format
 msgid "The hyperlink \"%s\" is not a valid cell address."
 msgstr "Гиперссылка \"%s\" не содержит верный адрес ячейки."
 
 #: fpsstrings.rsnovalidhyperlinkuri
+#, object-pascal-format
 msgid "The hyperlink \"%s\" is not a valid URI."
 msgstr "Гиперссылка \"%s\" не является правильным URI."
 
 #: fpsstrings.rsnovalidnumberformatstring
-msgid "No valid number format string."
+#, object-pascal-format, fuzzy, badformat
+#| msgid "No valid number format string."
+msgid "No valid number format string (%s)."
 msgstr "Не верная строка формата для чисел"
 
 #: fpsstrings.rsnovariable
+#, object-pascal-format
 msgid "Identifier %s is not a variable"
 msgstr "Идентификатор %s не переменная"
 
 #: fpsstrings.rsodshyperlinksoftextcellsonly
+#, object-pascal-format
 msgid "Cell %s: OpenDocument supports hyperlinks for text cells only."
 msgstr "Ячейка %s: OpenDocument поддерживает гиперссылки только для текстовых ячеек."
 
@@ -290,22 +335,24 @@ msgid "olive"
 msgstr "оливковый"
 
 #: fpsstrings.rsonlyoneheaderfooterimageallowed
+#, object-pascal-format
 msgid "Only one image per %s section allowed."
 msgstr "Разрешено только одно изображения для секции %s."
 
 #: fpsstrings.rsoperationexceedscolcount
-#, fuzzy,badformat
+#, object-pascal-format, fuzzy, badformat
 #| msgid "This operation exceeds the range of defined grid columns."
 msgid "This operation at index %d exceeds the range of defined grid columns (%d)."
 msgstr "Эта операция превышает диапазон определенных столбцов таблицы"
 
 #: fpsstrings.rsoperationexceedsrowcount
-#, fuzzy,badformat
+#, object-pascal-format, fuzzy, badformat
 #| msgid "This operation exceeds the range of defined grid rows."
 msgid "This operation at index %d exceeds the range of defined grid rows (%d)."
 msgstr "Эта операция превышает диапазон определенных столбцов таблицы"
 
 #: fpsstrings.rspaletteindex
+#, object-pascal-format
 msgid "Palette index %d"
 msgstr "Индекс палитры %d"
 
@@ -326,6 +373,7 @@ msgid "purple"
 msgstr ""
 
 #: fpsstrings.rsreadernotfound
+#, object-pascal-format
 msgid "Reader not found for file \"%s\""
 msgstr "Не найден модуль чтения для файла \"%s\""
 
@@ -334,10 +382,12 @@ msgid "red"
 msgstr "красный"
 
 #: fpsstrings.rsrightbracketexpected
+#, object-pascal-format
 msgid "Expected right bracket at position %d, but got %s"
 msgstr "Ожидается правая скобка в позиции %d, но найдено %s"
 
 #: fpsstrings.rsrightsquarebracketexpected
+#, object-pascal-format
 msgid "Expected right square bracket at positon %d, but got %s"
 msgstr ""
 
@@ -358,6 +408,7 @@ msgid "teal"
 msgstr ""
 
 #: fpsstrings.rstoomanypalettecolors
+#, object-pascal-format
 msgid "This workbook contains more colors (%d) than supported by the file format (%d). The additional colors are replaced by the best-matching palette colors."
 msgstr "Таблица содержит больше цветов (%d) чем поддерживается данным форматом (%d). Дополнительные цвета будут заменены аналогичными."
 
@@ -366,10 +417,12 @@ msgid "transparent"
 msgstr "прозрачно"
 
 #: fpsstrings.rstruncatetoolongcelltext
+#, object-pascal-format
 msgid "Text value exceeds the %d character limit in cell %s and has been truncated."
 msgstr "Текстовое выражения ограничено %d символами в ячейке %s и будет уменьшено."
 
 #: fpsstrings.rstruncatetoolongtext
+#, object-pascal-format
 msgid "Text value exceeds the %d character limit and has been truncated."
 msgstr ""
 
@@ -378,6 +431,7 @@ msgid "Unexpected end of expression"
 msgstr "Ожидается конец выражения"
 
 #: fpsstrings.rsunknowncharacter
+#, object-pascal-format
 msgid "Unknown character at pos %d: \"%s\""
 msgstr "Не известный символ в позиции %d: \"%s\""
 
@@ -390,6 +444,7 @@ msgid "Unknown data type."
 msgstr "Не определённый тип"
 
 #: fpsstrings.rsunknowndelimiter
+#, object-pascal-format
 msgid "Unknown delimiter character: \"%s\""
 msgstr "Не известный разделитель: \"%s\""
 
@@ -398,10 +453,12 @@ msgid "Unknown error type."
 msgstr "Не известный тип ошибки"
 
 #: fpsstrings.rsunknownidentifier
+#, object-pascal-format
 msgid "Unknown identifier: %s"
 msgstr "Не известная переменная: %s"
 
 #: fpsstrings.rsunknowntokenatpos
+#, object-pascal-format
 msgid "Unknown token at pos %d : %s"
 msgstr "Не известный символ в позиции %d : %s"
 
@@ -414,10 +471,12 @@ msgid "Tried to write a spreadsheet using an unsupported format"
 msgstr "Попытка записать таблицу используя не поддерживаемый формат"
 
 #: fpsstrings.rsunterminatedexpression
+#, object-pascal-format
 msgid "Badly terminated expression. Found token at position %d : %s"
 msgstr "Не верное окончание выражения. Найден символ в позиции %d : %s"
 
 #: fpsstrings.rsutf8textexpectedbutansifoundincell
+#, object-pascal-format
 msgid "Expected UTF8 text, but probably ANSI text found in cell %s."
 msgstr "Ожидается текст в UTF8 кодировке, но в ячейке %s возможно найден текст ANSI кодировке"
 
@@ -426,6 +485,7 @@ msgid "white"
 msgstr "белый"
 
 #: fpsstrings.rsworksheetnotfound
+#, object-pascal-format
 msgid "Worksheet \"%s\" not found."
 msgstr "Лист таблицы \"%s\" не найден."
 
@@ -434,6 +494,7 @@ msgid "Worksheet not found."
 msgstr "Лист таблицы не найден"
 
 #: fpsstrings.rswriteerror_worksheetnametoolong
+#, object-pascal-format
 msgid "File cannot be written because the name of worksheet \"%0:s\" is too long (max %1:d characters)."
 msgstr "Документ не может быть сохранён. Имя Имя листа \"%0:s\" очень большое (максимум %1:d символов)"
 
diff --git a/components/fpspreadsheet/source/common/xlsxml.pas b/components/fpspreadsheet/source/common/xlsxml.pas
index 33424792d..9cd6edd86 100644
--- a/components/fpspreadsheet/source/common/xlsxml.pas
+++ b/components/fpspreadsheet/source/common/xlsxml.pas
@@ -2379,8 +2379,11 @@ begin
         '</Row>' + LF);
       FPrevRow := r;
     end else
+    if (rowheightStr <> '') or (styleStr <> '') or (hiddenStr <> '') then begin
       AppendToStream(AStream, ROW_INDENT + Format(
         '<Row%s/>', [s]) + LF);
+      FPrevRow := r;
+    end;
   end;
 end;