diff --git a/components/fpspreadsheet/examples/visual/shared/snumformatform.pas b/components/fpspreadsheet/examples/visual/shared/snumformatform.pas
index b9f9ed325..4652c0389 100644
--- a/components/fpspreadsheet/examples/visual/shared/snumformatform.pas
+++ b/components/fpspreadsheet/examples/visual/shared/snumformatform.pas
@@ -6,7 +6,7 @@ interface
uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ButtonPanel,
- ExtCtrls, StdCtrls, Spin, Buttons, types, contnrs, inifiles,
+ ExtCtrls, StdCtrls, Spin, Buttons, types, inifiles,
fpsTypes, fpsNumFormat, fpSpreadsheet;
type
@@ -552,6 +552,7 @@ var
nfp: TsNumFormatParams;
idx: PtrInt;
begin
+ Unused(Control);
LbFormat.Canvas.Brush.Color := clWindow;
LbFormat.Canvas.Font.Assign(LbFormat.Font);
if State * [odSelected, odFocused] <> [] then
diff --git a/components/fpspreadsheet/fpspreadsheetctrls.pas b/components/fpspreadsheet/fpspreadsheetctrls.pas
index b54fd74e4..c95f3266b 100644
--- a/components/fpspreadsheet/fpspreadsheetctrls.pas
+++ b/components/fpspreadsheet/fpspreadsheetctrls.pas
@@ -29,7 +29,7 @@ interface
uses
Classes, Graphics, SysUtils, Controls, StdCtrls, ComCtrls, ValEdit, ActnList,
LResources,
- fpstypes, fpspalette, fpspreadsheet, {%H-}fpsAllFormats;
+ fpstypes, fpspreadsheet, {%H-}fpsAllFormats;
type
{@@ Event handler procedure for displaying a message if an error or
@@ -2408,9 +2408,6 @@ end;
-------------------------------------------------------------------------------}
procedure TsCellCombobox.Populate;
var
- i: Integer;
- clr: TsColor;
- clrname: String;
noText: Boolean;
begin
if Workbook = nil then
diff --git a/components/fpspreadsheet/fpsstrings.pas b/components/fpspreadsheet/fpsstrings.pas
index 8227c9592..55a2b355d 100644
--- a/components/fpspreadsheet/fpsstrings.pas
+++ b/components/fpspreadsheet/fpsstrings.pas
@@ -50,62 +50,25 @@ resourcestring
rsCodePageNotSupported = 'Code page "%s" is not supported. Using "cp1252" (Latin 1) instead.';
// Colors
- rsAqua = 'aqua';
- rsBeige = 'beige';
+ // EGA palette
rsBlack = 'black';
- rsBlue = 'blue';
- rsBlueGray = 'blue gray';
- rsBrown = 'brown';
- rsCoral = 'coral';
- rsCyan = 'cyan';
- rsDarkBlue = 'dark blue';
- rsDarkGreen = 'dark green';
- rsDarkPurple = 'dark purple';
- rsDarkRed = 'dark red';
- rsDarkTeal = 'dark teal';
- rsGold = 'gold';
- rsGray = 'gray';
- rsGray10pct = '10% gray';
- rsGray20pct = '20% gray';
- rsGray25pct = '25% gray';
- rsGray40pct = '40% gray';
- rsGray50pct = '50% gray';
- rsGray80pct = '80% gray';
- rsGreen = 'green';
- rsIceBlue = 'ice blue';
- rsIndigo = 'indigo';
- rsIvory = 'ivory';
- rsLavander = 'lavander';
- rsLightBlue = 'light blue';
- rsLightGreen = 'light green';
- rsLightOrange = 'light orange';
- rsLightTurquoise = 'light turquoise';
- rsLightYellow = 'light yellow';
- rsLime = 'lime';
- rsMagenta = 'magenta';
- rsNavy = 'navy';
- rsOceanBlue = 'ocean blue';
- rsOlive = 'olive';
- rsOliveGreen = 'olive green';
- rsOrange = 'orange';
- rsPaleBlue = 'pale blue';
- rsPeriwinkle = 'periwinkle';
- rsPink = 'pink';
- rsPlum = 'plum';
- rsPurple = 'purple';
- rsRed = 'red';
- rsRose = 'rose';
- rsSeaGreen = 'sea green';
- rsSilver = 'silver';
- rsSkyBlue = 'sky blue';
- rsTan = 'tan';
- rsTeal = 'teal';
- rsVeryDarkGreen = 'very dark green';
- rsViolet = 'violet';
- rsWheat = 'wheat';
rsWhite = 'white';
+ rsRed = 'red';
+ rsGreen = 'green';
+ rsBlue = 'blue';
rsYellow = 'yellow';
+ rsMagenta = 'magenta';
+ rsCyan = 'cyan';
+ rsDarkRed = 'dark red';
+ rsDarkGreen = 'dark green';
+ rsDarkBlue = 'dark blue';
+ rsOlive = 'olive';
+ rsPurple = 'purple';
+ rsTeal = 'teal';
+ rsSilver = 'silver';
+ rsGray = 'gray';
+ // Special colors
rsNotDefined = 'not defined';
rsTransparent = 'transparent';
rsPaletteIndex = 'Palette index %d';
@@ -213,6 +176,50 @@ resourcestring
'only if position is restored.';
+const
+ // Color names which do not have to be translated. They will be removed.
+ rsAqua = 'aqua' deprecated;
+ rsBeige = 'beige' deprecated;
+ rsBlueGray = 'blue gray' deprecated;
+ rsBrown = 'brown' deprecated;
+ rsCoral = 'coral' deprecated;
+ rsDarkPurple = 'dark purple' deprecated;
+ rsDarkTeal = 'dark teal' deprecated;
+ rsFuchsia = 'fuchsia' deprecated;
+ rsGold = 'gold' deprecated;
+ rsGray10pct = '10% gray' deprecated;
+ rsGray20pct = '20% gray' deprecated;
+ rsGray25pct = '25% gray' deprecated;
+ rsGray40pct = '40% gray' deprecated;
+ rsGray50pct = '50% gray' deprecated;
+ rsGray80pct = '80% gray' deprecated;
+ rsIceBlue = 'ice blue' deprecated;
+ rsIndigo = 'indigo' deprecated;
+ rsIvory = 'ivory' deprecated;
+ rsLavander = 'lavander' deprecated;
+ rsLightBlue = 'light blue' deprecated;
+ rsLightGreen = 'light green' deprecated;
+ rsLightOrange = 'light orange' deprecated;
+ rsLightTurquoise = 'light turquoise' deprecated;
+ rsLightYellow = 'light yellow' deprecated;
+ rsLime = 'lime' deprecated;
+ rsMaroon = 'maroon' deprecated;
+ rsNavy = 'navy' deprecated;
+ rsOceanBlue = 'ocean blue' deprecated;
+ rsOliveGreen = 'olive green' deprecated;
+ rsOrange = 'orange' deprecated;
+ rsPaleBlue = 'pale blue' deprecated;
+ rsPeriwinkle = 'periwinkle' deprecated;
+ rsPink = 'pink' deprecated;
+ rsPlum = 'plum' deprecated;
+ rsRose = 'rose' deprecated;
+ rsSeaGreen = 'sea green' deprecated;
+ rsSkyBlue = 'sky blue' deprecated;
+ rsTan = 'tan' deprecated;
+ rsVeryDarkGreen = 'very dark green' deprecated;
+ rsViolet = 'violet' deprecated;
+ rsWheat = 'wheat' deprecated;
+
implementation
end.
diff --git a/components/fpspreadsheet/fpstypes.pas b/components/fpspreadsheet/fpstypes.pas
index aad4288ba..51db330b7 100644
--- a/components/fpspreadsheet/fpstypes.pas
+++ b/components/fpspreadsheet/fpstypes.pas
@@ -347,7 +347,8 @@ type
TsColor = DWord;
const
- {@@ These are some important rgb color volues.
+ {@@ These are some basic rgb color volues. FPSpreadsheet will support
+ built-in color constants only for the EGA palette.
}
{@@ rgb value of black color, BIFF2 palette index 0, BIFF8 index 8}
scBlack = $00000000;
@@ -363,18 +364,14 @@ const
scYellow = $0000FFFF;
{@@ rgb value of magenta color, BIFF2 palette index 6, BIFF8 index 14 and 33}
scMagenta = $00FF00FF;
- scPink = $00FE00FE;
{@@ rgb value of cyan color, BIFF2 palette index 7, BIFF8 indexes 15}
scCyan = $00FFFF00;
- scTurquoise = scCyan;
{@@ rgb value of dark red color, BIFF8 indexes 16 and 35}
scDarkRed = $00000080;
{@@ rgb value of dark green color, BIFF8 index 17 }
scDarkGreen = $00008000;
{@@ rgb value of dark blue color }
- scDarkBlue = $008B0000;
- {@@ rgb value of "navy" color, BIFF8 palette indexes 18 and 32 }
- scNavy = $00800000;
+ scDarkBlue = $00800000;
{@@ rgb value of olive color }
scOlive = $00008080;
{@@ rgb value of purple color, BIFF8 palette indexes 20 and 36 }
@@ -383,94 +380,10 @@ const
scTeal = $00808000;
{@@ rgb value of silver color }
scSilver = $00C0C0C0;
- scGray25pct = scSilver;
{@@ rgb value of grey color }
scGray = $00808080;
{@@ rgb value of gray color }
scGrey = scGray; // redefine to allow different spelling
- scGray50pct = scGray;
- {@@ rgb value of a 10% grey color }
- scGray10pct = $00E6E6E6;
- {@@ rgb value of a 10% gray color }
- scGrey10pct = scGray10pct;
- {@@ rgb value of a 20% grey color }
- scGray20pct = $00CCCCCC;
- {@@ rgb value of a 20% gray color }
- scGrey20pct = scGray20pct;
- {@@ rgb value of periwinkle color, BIFF8 palette index 24 }
- scPeriwinkle = $00FF9999;
- {@@ rgb value of plum color, BIFF8 palette indexes 25 and 61 }
- scPlum = $00663399;
- {@@ rgb value of ivory color, BIFF8 palette index 26 }
- scIvory = $00CCFFFF;
- {@@ rgb value of light turquoise color, BIFF8 palette indexes 27 and 41 }
- scLightTurquoise = $00FFFFCC;
- {@@ rgb value of dark purple color, BIFF8 palette index 28 }
- scDarkPurple = $00660066;
- {@@ rgb value of coral color, BIFF8 palette index 29 }
- scCoral = $008080FF;
- {@@ rgb value of ocean blue color, BIFF8 palette index 30 }
- scOceanBlue = $00CC6600;
- {@@ rgb value of ice blue color, BIFF8 palette index 31 }
- scIceBlue = $00FFCCCC;
- {@@ rgb value of sky blue color, BIFF8 palette index 40 }
- scSkyBlue = $00FFCC00;
- {@@ rgb value of light green color, BIFF8 palette index 42 }
- scLightGreen = $00CCFFCC;
- {@@ rgb value of light yellow color, BIFF8 palette index 43 }
- scLightYellow = $0099FFFF;
- {@@ rgb value of pale blue color, BIFF8 palette index 44 }
- scPaleBlue = $00FFCC99;
- {@@ rgb value of rose color, BIFF8 palette index 45 }
- scRose = $00CC99FF;
- {@@ rgb value of lavander color, BIFF8 palette index 46 }
- scLavander = $00FF99CC;
- {@@ rgb value of tan color, BIFF8 palette index 47 }
- scTan = $0099CCFF;
- {@@ rgb value of light blue color, BIFF8 palette index 48 }
- scLightBlue = $00FF6633;
- {@@ rgb value of aqua color, BIFF8 palette index 49 }
- scAqua = $00CCCC33;
- {@@ rgb value of lime color, BIFF8 palette index 50 }
- scLime = $0000CC99;
- {@@ rgb value of golden color, BIFF8 palette index 51 }
- scGold = $0000CCFF;
- {@@ rgb value of light orange color, BIFF8 palette index 52 }
- scLightOrange = $000099FF;
- {@@ rgb value of orange color, BIFF8 palette index 53 }
- scOrange = $000066FF;
- {@@ rgb value of blue gray, BIFF8 palette index 54 }
- scBlueGray = $00996666;
- scBlueGrey = scBlueGray;
- {@@ rgb value of gray 40%, BIFF8 palette index 55 }
- scGray40pct = $00969696;
- {@@ rgb value of dark teal, BIFF8 palette index 56 }
- scDarkTeal = $00663300;
- {@@ rgb value of sea green, BIFF8 palette index 57 }
- scSeaGreen = $00669933;
- {@@ rgb value of very dark green, BIFF8 palette index 58 }
- scVeryDarkGreen = $00003300;
- {@@ rgb value of olive green color, BIFF8 palette index 59 }
- scOliveGreen = $00003333;
- {@@ rgb value of brown color, BIFF8 palette index 60 }
- scBrown = $00003399;
- {@@ rgb value of indigo color, BIFF8 palette index 62 }
- scIndigo = $00993333;
- {@@ rgb value of 80% gray, BIFF8 palette index 63 }
- scGray80pct = $00333333;
- scGrey80pct = scGray80pct;
-
-// {@@ rgb value of orange color }
-// scOrange = $0000A5FF;
- {@@ rgb value of dark brown color }
- scDarkBrown = $002D52A0;
-
-// {@@ rgb value of brown color }
-// scBrown = $003F85CD;
- {@@ rgb value of beige color }
- scBeige = $00DCF5F5;
- {@@ rgb value of "wheat" color (yellow-orange) }
- scWheat = $00B3DEF5;
{@@ Identifier for not-defined color }
scNotDefined = $40000000;
@@ -481,6 +394,56 @@ const
{@@ Mask for the rgb components contained in the TsColor }
scRGBMask = $00FFFFFF;
+ // aliases for LCL colors, deprecated
+ scAqua = scCyan deprecated;
+ scFuchsia = scMagenta deprecated;
+ scLime = scGreen deprecated;
+ scMaroon = scDarkRed deprecated;
+ scNavy = scDarkBlue deprecated;
+
+ { These color constants are deprecated, they will be removed in the long term }
+ scPink = $00FE00FE deprecated;
+ scTurquoise = scCyan deprecated;
+ scGray25pct = scSilver deprecated;
+ scGray50pct = scGray deprecated;
+ scGray10pct = $00E6E6E6 deprecated;
+ scGrey10pct = scGray10pct deprecated;
+ scGray20pct = $00CCCCCC deprecated;
+ scGrey20pct = scGray20pct deprecated;
+ scPeriwinkle = $00FF9999 deprecated;
+ scPlum = $00663399 deprecated;
+ scIvory = $00CCFFFF deprecated;
+ scLightTurquoise = $00FFFFCC deprecated;
+ scDarkPurple = $00660066 deprecated;
+ scCoral = $008080FF deprecated;
+ scOceanBlue = $00CC6600 deprecated;
+ scIceBlue = $00FFCCCC deprecated;
+ scSkyBlue = $00FFCC00 deprecated;
+ scLightGreen = $00CCFFCC deprecated;
+ scLightYellow = $0099FFFF deprecated;
+ scPaleBlue = $00FFCC99 deprecated;
+ scRose = $00CC99FF deprecated;
+ scLavander = $00FF99CC deprecated;
+ scTan = $0099CCFF deprecated;
+ scLightBlue = $00FF6633 deprecated;
+ scGold = $0000CCFF deprecated;
+ scLightOrange = $000099FF deprecated;
+ scOrange = $000066FF deprecated;
+ scBlueGray = $00996666 deprecated;
+ scBlueGrey = scBlueGray deprecated;
+ scGray40pct = $00969696 deprecated;
+ scDarkTeal = $00663300 deprecated;
+ scSeaGreen = $00669933 deprecated;
+ scVeryDarkGreen = $00003300 deprecated;
+ scOliveGreen = $00003333 deprecated;
+ scBrown = $00003399 deprecated;
+ scIndigo = $00993333 deprecated;
+ scGray80pct = $00333333 deprecated;
+// scGrey80pct = scGray80pct deprecated;
+ scDarkBrown = $002D52A0 deprecated;
+ scBeige = $00DCF5F5 deprecated;
+ scWheat = $00B3DEF5 deprecated;
+
type
{@@ Font style (redefined to avoid usage of "Graphics" }
TsFontStyle = (fssBold, fssItalic, fssStrikeOut, fssUnderline);
diff --git a/components/fpspreadsheet/fpsutils.pas b/components/fpspreadsheet/fpsutils.pas
index 9ebde77f0..40a43781d 100644
--- a/components/fpspreadsheet/fpsutils.pas
+++ b/components/fpspreadsheet/fpsutils.pas
@@ -1765,61 +1765,24 @@ var
rgba: TRGBA absolute AColor;
begin
case AColor of
- scAqua : Result := rsAqua;
- scBeige : Result := rsBeige;
- scBlack : Result := rsBlack;
- scBlue : Result := rsBlue;
- scBlueGray : Result := rsBlueGray;
- scBrown : Result := rsBrown;
- scCoral : Result := rsCoral;
- scCyan : Result := rsCyan;
- scDarkBlue : Result := rsDarkBlue;
- scDarkGreen : Result := rsDarkGreen;
- scDarkPurple : Result := rsDarkPurple;
- scDarkRed : Result := rsDarkRed;
- scDarkTeal : Result := rsDarkTeal;
- scGold : Result := rsGold;
- scGray : Result := rsGray;
- scGray10pct : Result := rsGray10pct;
- scGray20pct : Result := rsGray20pct;
- scGray40pct : Result := rsGray40pct;
- scGray80pct : Result := rsGray80pct;
- scGreen : Result := rsGreen;
- scIceBlue : Result := rsIceBlue;
- scIndigo : Result := rsIndigo;
- scIvory : Result := rsIvory;
- scLavander : Result := rsLavander;
- scLightBlue : Result := rsLightBlue;
- scLightGreen : Result := rsLightGreen;
- scLightOrange: Result := rsLightOrange;
- scLightTurquoise: Result := rsLightTurquoise;
- scLightYellow: Result := rsLightYellow;
- scLime : Result := rsLime;
- scMagenta : Result := rsMagenta;
- scNavy : Result := rsNavy;
- scOceanBlue : Result := rsOceanBlue;
- scOlive : Result := rsOlive;
- scOliveGreen : Result := rsOliveGreen;
- scOrange : Result := rsOrange;
- scPaleBlue : Result := rsPaleBlue;
- scPeriwinkle : Result := rsPeriwinkle;
- scPink : Result := rsPink;
- scPlum : Result := rsPlum;
- scPurple : Result := rsPurple;
- scRed : Result := rsRed;
- scRose : Result := rsRose;
- scSeaGreen : Result := rsSeaGreen;
- scSilver : Result := rsSilver;
- scSkyBlue : Result := rsSkyBlue;
- scTan : Result := rsTan;
- scTeal : Result := rsTeal;
- scVeryDarkGreen: Result := rsVeryDarkGreen;
-// scViolet : Result := rsViolet;
- scWheat : Result := rsWheat;
- scWhite : Result := rsWhite;
- scYellow : Result := rsYellow;
- scTransparent: Result := rsTransparent;
- scNotDefined : Result := rsNotDefined;
+ scBlack : Result := rsBlack;
+ scGreen : Result := rsGreen;
+ scOlive : Result := rsOlive;
+ scPurple : Result := rsPurple;
+ scTeal : Result := rsTeal;
+ scGray : Result := rsGray;
+ scSilver : Result := rsSilver;
+ scRed : Result := rsRed;
+ scYellow : Result := rsYellow;
+ scBlue : Result := rsBlue;
+ scWhite : Result := rsWhite;
+ scMagenta : Result := rsMagenta;
+ scCyan : Result := rsCyan;
+ scDarkRed : Result := rsDarkRed;
+ scDarkGreen : Result := rsDarkGreen;
+ scDarkBlue : result := rsDarkBlue;
+ scTransparent : Result := rsTransparent;
+ scNotDefined : Result := rsNotDefined;
else
case rgba.a of
$00:
diff --git a/components/fpspreadsheet/languages/fpsstrings.de.po b/components/fpspreadsheet/languages/fpsstrings.de.po
index 2d5f5aa20..33a0b3ebf 100644
--- a/components/fpspreadsheet/languages/fpsstrings.de.po
+++ b/components/fpspreadsheet/languages/fpsstrings.de.po
@@ -24,33 +24,17 @@ msgstr "Alle Spreadsheet-Dateien"
msgid "Assuming usage of decimal separator in \"%s\"."
msgstr "Verwendung eines Dezimaltrennzeichens in \"%s\" wird angenommen."
-#: fpsstrings.rsaqua
-msgid "aqua"
-msgstr "wasserblau"
-
#: fpsstrings.rsbadquotes
msgid "Unterminated string"
msgstr "Begrenzungszeichen des Strings fehlt."
-#: fpsstrings.rsbeige
-msgid "beige"
-msgstr "beige"
-
#: fpsstrings.rsblack
msgid "black"
msgstr "schwarz"
#: fpsstrings.rsblue
msgid "blue"
-msgstr "balu"
-
-#: fpsstrings.rsbluegray
-msgid "blue gray"
-msgstr "blaugrau"
-
-#: fpsstrings.rsbrown
-msgid "brown"
-msgstr "braun"
+msgstr "blau"
#: fpsstrings.rscannotreadfile
msgid "Cannot read file \"%s\". Wrong, unknown or defective file format?"
@@ -76,10 +60,6 @@ msgstr "Spalten-Stil nicht gefunden."
msgid "Expected comma (,) at position %d, but got %s"
msgstr "Komma erwartet an Position %d, aber %s gefunden."
-#: fpsstrings.rscoral
-msgid "coral"
-msgstr "korall"
-
#: fpsstrings.rscyan
msgid "cyan"
msgstr "cyan"
@@ -92,18 +72,10 @@ msgstr "dunkelblau"
msgid "dark green"
msgstr "dunkelgrün"
-#: fpsstrings.rsdarkpurple
-msgid "dark purple"
-msgstr "dunkelpurpur"
-
#: fpsstrings.rsdarkred
msgid "dark red"
msgstr "dunkelrot"
-#: fpsstrings.rsdarkteal
-msgid "dark teal"
-msgstr "dunkel-türkis"
-
#: fpsstrings.rsdefaultsheetname
msgid "Sheet%d"
msgstr "Tabelle%d"
@@ -168,38 +140,10 @@ msgstr "Die Formel in Zelle %s wird in diesem Dateiformat nicht unterstützt: %s
msgid "Spreadsheet file"
msgstr "Spreadsheet-Datei"
-#: fpsstrings.rsgold
-msgid "gold"
-msgstr "golden"
-
#: fpsstrings.rsgray
msgid "gray"
msgstr "grau"
-#: fpsstrings.rsgray10pct
-msgid "10% gray"
-msgstr "10% grau"
-
-#: fpsstrings.rsgray20pct
-msgid "20% gray"
-msgstr "20% grau"
-
-#: fpsstrings.rsgray25pct
-msgid "25% gray"
-msgstr "25% grau"
-
-#: fpsstrings.rsgray40pct
-msgid "40% gray"
-msgstr "40% grau"
-
-#: fpsstrings.rsgray50pct
-msgid "50% gray"
-msgstr "50% grau"
-
-#: fpsstrings.rsgray80pct
-msgid "80% gray"
-msgstr "80% grau"
-
#: fpsstrings.rsgreen
msgid "green"
msgstr "grün"
@@ -208,10 +152,6 @@ msgstr "grün"
msgid "Header"
msgstr "Kopfzeile"
-#: fpsstrings.rsiceblue
-msgid "ice blue"
-msgstr "eisblau"
-
#: fpsstrings.rsimageformatnotsupported
msgid "Image format not supported."
msgstr "Bild-Format nicht unterstützt."
@@ -224,10 +164,6 @@ msgstr "Falsche Position des %%G-Codes in %s"
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.rsindigo
-msgid "indigo"
-msgstr "indigo"
-
#: fpsstrings.rsinvalidargumentcount
msgid "Invalid argument count for function %s"
msgstr "Ungültige Anzahl von Argumenten für die Funktion %s"
@@ -284,42 +220,10 @@ msgstr "\"%s\" ist keine gültige Spreadsheet-Datei."
msgid "\"%s\" is not a valid worksheet name."
msgstr "\"%s\" ist kein gültiger Name für ein Arbeitsblatt."
-#: fpsstrings.rsivory
-msgid "ivory"
-msgstr "elfenbein"
-
-#: fpsstrings.rslavander
-msgid "lavander"
-msgstr "lavendel"
-
#: fpsstrings.rsleftbracketexpected
msgid "Expected left bracket at position %d, but got %s"
msgstr "Linke Klammer erwartet an Position %d, aber %s gefunden."
-#: fpsstrings.rslightblue
-msgid "light blue"
-msgstr "hellblau"
-
-#: fpsstrings.rslightgreen
-msgid "light green"
-msgstr "hellgrün"
-
-#: fpsstrings.rslightorange
-msgid "light orange"
-msgstr "hell-orange"
-
-#: fpsstrings.rslightturquoise
-msgid "light turquoise"
-msgstr "hell-türkis"
-
-#: fpsstrings.rslightyellow
-msgid "light yellow"
-msgstr "hellgelb"
-
-#: fpsstrings.rslime
-msgid "lime"
-msgstr "hellgrün-limone"
-
#: fpsstrings.rslocalfilehyperlinkabs
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."
@@ -340,10 +244,6 @@ msgstr "Das Arbeitsbuch enthält %d Zeilen, aber das ausgewählte Dateiformat un
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.rsnavy
-msgid "navy"
-msgstr "marine-blau"
-
#: fpsstrings.rsnooperand
msgid "No operand for unary operation %s"
msgstr "Kein Operand für die unäre Operation %s"
@@ -384,10 +284,6 @@ msgstr "Kein gültiges Zahlenformat"
msgid "Identifier %s is not a variable"
msgstr "Der Bezeichnis %s ist keine Variable."
-#: fpsstrings.rsoceanblue
-msgid "ocean blue"
-msgstr "Meerblau"
-
#: fpsstrings.rsodshyperlinksoftextcellsonly
msgid "Cell %s: OpenDocument supports hyperlinks for text cells only."
msgstr "Zelle %s: Das OpenDocument-Format unterstützt Hyperlinks nur für Text-Zellen."
@@ -396,10 +292,6 @@ msgstr "Zelle %s: Das OpenDocument-Format unterstützt Hyperlinks nur für Text-
msgid "olive"
msgstr "oliv"
-#: fpsstrings.rsolivegreen
-msgid "olive green"
-msgstr "olivgrün"
-
#: fpsstrings.rsonlyoneheaderfooterimageallowed
msgid "Only one image per %s section allowed."
msgstr "Nur ein Bild ist erlaubt pro %s Abschnitt."
@@ -412,30 +304,10 @@ msgstr "Diese Operation überschreitet den Bereich der definierten Spalten."
msgid "This operation exceeds the range of defined grid rows."
msgstr "Diese Operation überschreitet den Bereich der definierten Zeilen."
-#: fpsstrings.rsorange
-msgid "orange"
-msgstr "orange"
-
-#: fpsstrings.rspaleblue
-msgid "pale blue"
-msgstr "blassblau"
-
#: fpsstrings.rspaletteindex
msgid "Palette index %d"
msgstr "Palettenindex %d"
-#: fpsstrings.rsperiwinkle
-msgid "periwinkle"
-msgstr "lavendelblau"
-
-#: fpsstrings.rspink
-msgid "pink"
-msgstr "pink"
-
-#: fpsstrings.rsplum
-msgid "plum"
-msgstr "pflaume"
-
#: fpsstrings.rspurple
msgid "purple"
msgstr "purpur"
@@ -452,37 +324,21 @@ msgstr "rot"
msgid "Expected right bracket at position %d, but got %s"
msgstr "Rechte Klammer erwartet an Position, aber %s gefunden."
-#: fpsstrings.rsrose
-msgid "rose"
-msgstr "rosa"
-
#: fpsstrings.rsrowstylenotfound
msgid "Row style not found."
msgstr "Zeilenstil nicht gefunden."
-#: fpsstrings.rsseagreen
-msgid "sea green"
-msgstr "seegrün"
-
#: fpsstrings.rssilver
msgid "silver"
msgstr "silber"
-#: fpsstrings.rsskyblue
-msgid "sky blue"
-msgstr "himmelblau"
-
#: fpsstrings.rsstdhyperlinktooltip
msgid "Hold the left mouse button down for a short time to activate the hyperlink."
msgstr "Halten Sie die linke Maustaste für kurze Zeit gedrückt, um den Hyperlink zu aktivieren."
-#: fpsstrings.rstan
-msgid "tan"
-msgstr "hautfarben"
-
#: fpsstrings.rsteal
msgid "teal"
-msgstr "türkis"
+msgstr "blaugrün"
#: fpsstrings.rstoomanypalettecolors
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."
@@ -544,18 +400,6 @@ msgstr "Schlecht terminierter Ausdruck. Symbol gefunden an Position %d : %s"
msgid "Expected UTF8 text, but probably ANSI text found in cell %s."
msgstr "In Zelle %s UTF8-Text erwartet, aber wahrscheinlich ANSI-Text gefunden"
-#: fpsstrings.rsverydarkgreen
-msgid "very dark green"
-msgstr "sehr dunkles Grün"
-
-#: fpsstrings.rsviolet
-msgid "violet"
-msgstr "violett"
-
-#: fpsstrings.rswheat
-msgid "wheat"
-msgstr "weizen"
-
#: fpsstrings.rswhite
msgid "white"
msgstr "weiß"
diff --git a/components/fpspreadsheet/languages/fpsstrings.fi.po b/components/fpspreadsheet/languages/fpsstrings.fi.po
index 201059782..25704af00 100644
--- a/components/fpspreadsheet/languages/fpsstrings.fi.po
+++ b/components/fpspreadsheet/languages/fpsstrings.fi.po
@@ -13,18 +13,10 @@ msgstr "Kaikki taulukkolaskenta tiedostot"
msgid "Assuming usage of decimal separator in \"%s\"."
msgstr ""
-#: fpsstrings.rsaqua
-msgid "aqua"
-msgstr ""
-
#: fpsstrings.rsbadquotes
msgid "Unterminated string"
msgstr ""
-#: fpsstrings.rsbeige
-msgid "beige"
-msgstr ""
-
#: fpsstrings.rsblack
msgid "black"
msgstr "musta"
@@ -33,14 +25,6 @@ msgstr "musta"
msgid "blue"
msgstr "sininen"
-#: fpsstrings.rsbluegray
-msgid "blue gray"
-msgstr "sinisen harmaa"
-
-#: fpsstrings.rsbrown
-msgid "brown"
-msgstr "ruskea"
-
#: fpsstrings.rscannotreadfile
msgid "Cannot read file \"%s\". Wrong, unknown or defective file format?"
msgstr ""
@@ -65,10 +49,6 @@ msgstr ""
msgid "Expected comma (,) at position %d, but got %s"
msgstr "Odotettiin pilkkua (,) kohdassa %d mutta saatiin %s"
-#: fpsstrings.rscoral
-msgid "coral"
-msgstr ""
-
#: fpsstrings.rscyan
msgid "cyan"
msgstr "syaani"
@@ -81,18 +61,10 @@ msgstr "tumman sininen"
msgid "dark green"
msgstr "tumman vihreä"
-#: fpsstrings.rsdarkpurple
-msgid "dark purple"
-msgstr ""
-
#: fpsstrings.rsdarkred
msgid "dark red"
msgstr "tumman punainen"
-#: fpsstrings.rsdarkteal
-msgid "dark teal"
-msgstr ""
-
#: fpsstrings.rsdefaultsheetname
msgid "Sheet%d"
msgstr "Sivu %d"
@@ -157,38 +129,10 @@ msgstr "Laskentakaava solussa %s ei ole tuettu tässä tiedostoformaatissa: %s"
msgid "Spreadsheet file"
msgstr "Taulukkolaskentatiedosto"
-#: fpsstrings.rsgold
-msgid "gold"
-msgstr "kulta"
-
#: fpsstrings.rsgray
msgid "gray"
msgstr "harmaa"
-#: fpsstrings.rsgray10pct
-msgid "10% gray"
-msgstr "10% harmaa"
-
-#: fpsstrings.rsgray20pct
-msgid "20% gray"
-msgstr "20% harmaa"
-
-#: fpsstrings.rsgray25pct
-msgid "25% gray"
-msgstr "25% harmaa"
-
-#: fpsstrings.rsgray40pct
-msgid "40% gray"
-msgstr "40% harmaa"
-
-#: fpsstrings.rsgray50pct
-msgid "50% gray"
-msgstr "50% harmaa"
-
-#: fpsstrings.rsgray80pct
-msgid "80% gray"
-msgstr "80% harmaa"
-
#: fpsstrings.rsgreen
msgid "green"
msgstr "vihreä"
@@ -197,10 +141,6 @@ msgstr "vihreä"
msgid "Header"
msgstr "Otsikko"
-#: fpsstrings.rsiceblue
-msgid "ice blue"
-msgstr "jään sininen"
-
#: fpsstrings.rsimageformatnotsupported
msgid "Image format not supported."
msgstr "Kuvatiedostoformaattia ei ole tuettu"
@@ -213,10 +153,6 @@ msgstr ""
msgid "Index %d in SST out of range (0-%d)."
msgstr ""
-#: fpsstrings.rsindigo
-msgid "indigo"
-msgstr ""
-
#: fpsstrings.rsinvalidargumentcount
msgid "Invalid argument count for function %s"
msgstr ""
@@ -273,42 +209,10 @@ msgstr "\"%s\" ei ole sallittu taulukkolaskentatiedosto"
msgid "\"%s\" is not a valid worksheet name."
msgstr ""
-#: fpsstrings.rsivory
-msgid "ivory"
-msgstr ""
-
-#: fpsstrings.rslavander
-msgid "lavander"
-msgstr ""
-
#: fpsstrings.rsleftbracketexpected
msgid "Expected left bracket at position %d, but got %s"
msgstr "Odotettiin vasenta suljetta kohdassa %d mutta saatiin %s"
-#: fpsstrings.rslightblue
-msgid "light blue"
-msgstr "vaalean sininen"
-
-#: fpsstrings.rslightgreen
-msgid "light green"
-msgstr "vaalean vihreä"
-
-#: fpsstrings.rslightorange
-msgid "light orange"
-msgstr "vaalea oranssi"
-
-#: fpsstrings.rslightturquoise
-msgid "light turquoise"
-msgstr "vaalea turkoosi"
-
-#: fpsstrings.rslightyellow
-msgid "light yellow"
-msgstr "vaalean keltainen"
-
-#: fpsstrings.rslime
-msgid "lime"
-msgstr ""
-
#: fpsstrings.rslocalfilehyperlinkabs
msgid "The hyperlink \"%s\" points to a local file. In case of an absolute path the protocol \"file:\" must be specified."
msgstr ""
@@ -329,10 +233,6 @@ msgstr "Tämä asiakirja sisältää %d riviä, mutta valittu tiedostoformaatti
msgid "Export to multiple sheets is possible only if position is restored."
msgstr ""
-#: fpsstrings.rsnavy
-msgid "navy"
-msgstr ""
-
#: fpsstrings.rsnooperand
msgid "No operand for unary operation %s"
msgstr ""
@@ -373,10 +273,6 @@ msgstr ""
msgid "Identifier %s is not a variable"
msgstr "Tunniste %s ei ole muuttuja"
-#: fpsstrings.rsoceanblue
-msgid "ocean blue"
-msgstr "meren sininen"
-
#: fpsstrings.rsodshyperlinksoftextcellsonly
msgid "Cell %s: OpenDocument supports hyperlinks for text cells only."
msgstr "Solu %s: OpenDocument tukee hyperlinkkejä ainoastaan tekstisoluissa"
@@ -385,10 +281,6 @@ msgstr "Solu %s: OpenDocument tukee hyperlinkkejä ainoastaan tekstisoluissa"
msgid "olive"
msgstr "oliivi"
-#: fpsstrings.rsolivegreen
-msgid "olive green"
-msgstr "oliivin vihreä"
-
#: fpsstrings.rsonlyoneheaderfooterimageallowed
msgid "Only one image per %s section allowed."
msgstr ""
@@ -401,30 +293,10 @@ msgstr ""
msgid "This operation exceeds the range of defined grid rows."
msgstr ""
-#: fpsstrings.rsorange
-msgid "orange"
-msgstr "oranssi"
-
-#: fpsstrings.rspaleblue
-msgid "pale blue"
-msgstr ""
-
#: fpsstrings.rspaletteindex
msgid "Palette index %d"
msgstr ""
-#: fpsstrings.rsperiwinkle
-msgid "periwinkle"
-msgstr ""
-
-#: fpsstrings.rspink
-msgid "pink"
-msgstr "pinkki"
-
-#: fpsstrings.rsplum
-msgid "plum"
-msgstr ""
-
#: fpsstrings.rspurple
msgid "purple"
msgstr ""
@@ -441,34 +313,18 @@ msgstr "punainen"
msgid "Expected right bracket at position %d, but got %s"
msgstr "Odotettiin oikeata suljetta kohdassa %d mutta saatiin %s"
-#: fpsstrings.rsrose
-msgid "rose"
-msgstr "ruusun punainen"
-
#: fpsstrings.rsrowstylenotfound
msgid "Row style not found."
msgstr "Rivin tyyliä ei löydetty."
-#: fpsstrings.rsseagreen
-msgid "sea green"
-msgstr "meren vihreä"
-
#: fpsstrings.rssilver
msgid "silver"
msgstr "hopea"
-#: fpsstrings.rsskyblue
-msgid "sky blue"
-msgstr "taivaan sininen"
-
#: fpsstrings.rsstdhyperlinktooltip
msgid "Hold the left mouse button down for a short time to activate the hyperlink."
msgstr "Pidä vasen hiiren painike alhaalla lyhyen ajan aktivoidaksesi hyperlinkin."
-#: fpsstrings.rstan
-msgid "tan"
-msgstr ""
-
#: fpsstrings.rsteal
msgid "teal"
msgstr ""
@@ -533,18 +389,6 @@ msgstr ""
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."
-#: fpsstrings.rsverydarkgreen
-msgid "very dark green"
-msgstr "Erittäin tumma vihreä"
-
-#: fpsstrings.rsviolet
-msgid "violet"
-msgstr "violetti"
-
-#: fpsstrings.rswheat
-msgid "wheat"
-msgstr ""
-
#: fpsstrings.rswhite
msgid "white"
msgstr "valkoinen"
diff --git a/components/fpspreadsheet/languages/fpsstrings.po b/components/fpspreadsheet/languages/fpsstrings.po
index b3b7dc644..ad99bafe8 100644
--- a/components/fpspreadsheet/languages/fpsstrings.po
+++ b/components/fpspreadsheet/languages/fpsstrings.po
@@ -13,18 +13,10 @@ msgstr ""
msgid "Assuming usage of decimal separator in \"%s\"."
msgstr ""
-#: fpsstrings.rsaqua
-msgid "aqua"
-msgstr ""
-
#: fpsstrings.rsbadquotes
msgid "Unterminated string"
msgstr ""
-#: fpsstrings.rsbeige
-msgid "beige"
-msgstr ""
-
#: fpsstrings.rsblack
msgid "black"
msgstr ""
@@ -33,14 +25,6 @@ msgstr ""
msgid "blue"
msgstr ""
-#: fpsstrings.rsbluegray
-msgid "blue gray"
-msgstr ""
-
-#: fpsstrings.rsbrown
-msgid "brown"
-msgstr ""
-
#: fpsstrings.rscannotreadfile
msgid "Cannot read file \"%s\". Wrong, unknown or defective file format?"
msgstr ""
@@ -65,10 +49,6 @@ msgstr ""
msgid "Expected comma (,) at position %d, but got %s"
msgstr ""
-#: fpsstrings.rscoral
-msgid "coral"
-msgstr ""
-
#: fpsstrings.rscyan
msgid "cyan"
msgstr ""
@@ -81,18 +61,10 @@ msgstr ""
msgid "dark green"
msgstr ""
-#: fpsstrings.rsdarkpurple
-msgid "dark purple"
-msgstr ""
-
#: fpsstrings.rsdarkred
msgid "dark red"
msgstr ""
-#: fpsstrings.rsdarkteal
-msgid "dark teal"
-msgstr ""
-
#: fpsstrings.rsdefaultsheetname
msgid "Sheet%d"
msgstr ""
@@ -157,38 +129,10 @@ msgstr ""
msgid "Spreadsheet file"
msgstr ""
-#: fpsstrings.rsgold
-msgid "gold"
-msgstr ""
-
#: fpsstrings.rsgray
msgid "gray"
msgstr ""
-#: fpsstrings.rsgray10pct
-msgid "10% gray"
-msgstr ""
-
-#: fpsstrings.rsgray20pct
-msgid "20% gray"
-msgstr ""
-
-#: fpsstrings.rsgray25pct
-msgid "25% gray"
-msgstr ""
-
-#: fpsstrings.rsgray40pct
-msgid "40% gray"
-msgstr ""
-
-#: fpsstrings.rsgray50pct
-msgid "50% gray"
-msgstr ""
-
-#: fpsstrings.rsgray80pct
-msgid "80% gray"
-msgstr ""
-
#: fpsstrings.rsgreen
msgid "green"
msgstr ""
@@ -197,10 +141,6 @@ msgstr ""
msgid "Header"
msgstr ""
-#: fpsstrings.rsiceblue
-msgid "ice blue"
-msgstr ""
-
#: fpsstrings.rsimageformatnotsupported
msgid "Image format not supported."
msgstr ""
@@ -213,10 +153,6 @@ msgstr ""
msgid "Index %d in SST out of range (0-%d)."
msgstr ""
-#: fpsstrings.rsindigo
-msgid "indigo"
-msgstr ""
-
#: fpsstrings.rsinvalidargumentcount
msgid "Invalid argument count for function %s"
msgstr ""
@@ -273,42 +209,10 @@ msgstr ""
msgid "\"%s\" is not a valid worksheet name."
msgstr ""
-#: fpsstrings.rsivory
-msgid "ivory"
-msgstr ""
-
-#: fpsstrings.rslavander
-msgid "lavander"
-msgstr ""
-
#: fpsstrings.rsleftbracketexpected
msgid "Expected left bracket at position %d, but got %s"
msgstr ""
-#: fpsstrings.rslightblue
-msgid "light blue"
-msgstr ""
-
-#: fpsstrings.rslightgreen
-msgid "light green"
-msgstr ""
-
-#: fpsstrings.rslightorange
-msgid "light orange"
-msgstr ""
-
-#: fpsstrings.rslightturquoise
-msgid "light turquoise"
-msgstr ""
-
-#: fpsstrings.rslightyellow
-msgid "light yellow"
-msgstr ""
-
-#: fpsstrings.rslime
-msgid "lime"
-msgstr ""
-
#: fpsstrings.rslocalfilehyperlinkabs
msgid "The hyperlink \"%s\" points to a local file. In case of an absolute path the protocol \"file:\" must be specified."
msgstr ""
@@ -329,10 +233,6 @@ msgstr ""
msgid "Export to multiple sheets is possible only if position is restored."
msgstr ""
-#: fpsstrings.rsnavy
-msgid "navy"
-msgstr ""
-
#: fpsstrings.rsnooperand
msgid "No operand for unary operation %s"
msgstr ""
@@ -373,10 +273,6 @@ msgstr ""
msgid "Identifier %s is not a variable"
msgstr ""
-#: fpsstrings.rsoceanblue
-msgid "ocean blue"
-msgstr ""
-
#: fpsstrings.rsodshyperlinksoftextcellsonly
msgid "Cell %s: OpenDocument supports hyperlinks for text cells only."
msgstr ""
@@ -385,10 +281,6 @@ msgstr ""
msgid "olive"
msgstr ""
-#: fpsstrings.rsolivegreen
-msgid "olive green"
-msgstr ""
-
#: fpsstrings.rsonlyoneheaderfooterimageallowed
msgid "Only one image per %s section allowed."
msgstr ""
@@ -401,30 +293,10 @@ msgstr ""
msgid "This operation exceeds the range of defined grid rows."
msgstr ""
-#: fpsstrings.rsorange
-msgid "orange"
-msgstr ""
-
-#: fpsstrings.rspaleblue
-msgid "pale blue"
-msgstr ""
-
#: fpsstrings.rspaletteindex
msgid "Palette index %d"
msgstr ""
-#: fpsstrings.rsperiwinkle
-msgid "periwinkle"
-msgstr ""
-
-#: fpsstrings.rspink
-msgid "pink"
-msgstr ""
-
-#: fpsstrings.rsplum
-msgid "plum"
-msgstr ""
-
#: fpsstrings.rspurple
msgid "purple"
msgstr ""
@@ -441,34 +313,18 @@ msgstr ""
msgid "Expected right bracket at position %d, but got %s"
msgstr ""
-#: fpsstrings.rsrose
-msgid "rose"
-msgstr ""
-
#: fpsstrings.rsrowstylenotfound
msgid "Row style not found."
msgstr ""
-#: fpsstrings.rsseagreen
-msgid "sea green"
-msgstr ""
-
#: fpsstrings.rssilver
msgid "silver"
msgstr ""
-#: fpsstrings.rsskyblue
-msgid "sky blue"
-msgstr ""
-
#: fpsstrings.rsstdhyperlinktooltip
msgid "Hold the left mouse button down for a short time to activate the hyperlink."
msgstr ""
-#: fpsstrings.rstan
-msgid "tan"
-msgstr ""
-
#: fpsstrings.rsteal
msgid "teal"
msgstr ""
@@ -533,18 +389,6 @@ msgstr ""
msgid "Expected UTF8 text, but probably ANSI text found in cell %s."
msgstr ""
-#: fpsstrings.rsverydarkgreen
-msgid "very dark green"
-msgstr ""
-
-#: fpsstrings.rsviolet
-msgid "violet"
-msgstr ""
-
-#: fpsstrings.rswheat
-msgid "wheat"
-msgstr ""
-
#: fpsstrings.rswhite
msgid "white"
msgstr ""
diff --git a/components/fpspreadsheet/languages/fpsstrings.ru.po b/components/fpspreadsheet/languages/fpsstrings.ru.po
index a27797266..4dc47206e 100644
--- a/components/fpspreadsheet/languages/fpsstrings.ru.po
+++ b/components/fpspreadsheet/languages/fpsstrings.ru.po
@@ -13,18 +13,10 @@ msgstr "Все файлы электронных таблиц"
msgid "Assuming usage of decimal separator in \"%s\"."
msgstr "Предпологается использование десятичного разеделителя в \"%s\"."
-#: fpsstrings.rsaqua
-msgid "aqua"
-msgstr "вода"
-
#: fpsstrings.rsbadquotes
msgid "Unterminated string"
msgstr "Не законченная строка"
-#: fpsstrings.rsbeige
-msgid "beige"
-msgstr "бежевый"
-
#: fpsstrings.rsblack
msgid "black"
msgstr "чёрный"
@@ -33,14 +25,6 @@ msgstr "чёрный"
msgid "blue"
msgstr "голубой"
-#: fpsstrings.rsbluegray
-msgid "blue gray"
-msgstr "серо-голубой"
-
-#: fpsstrings.rsbrown
-msgid "brown"
-msgstr "коричневый"
-
#: fpsstrings.rscannotreadfile
msgid "Cannot read file \"%s\". Wrong, unknown or defective file format?"
msgstr "Ошибка чтения файла \"%s\". Файл повреждён либо неизвестный формат файла?"
@@ -65,10 +49,6 @@ msgstr "Стиль столбца не найден."
msgid "Expected comma (,) at position %d, but got %s"
msgstr "Ожидайется запятая (,) в позиции %d, но найдено %s"
-#: fpsstrings.rscoral
-msgid "coral"
-msgstr "коралловый"
-
#: fpsstrings.rscyan
msgid "cyan"
msgstr "бирюзовый"
@@ -81,18 +61,10 @@ msgstr "тёмно-голубой"
msgid "dark green"
msgstr "тёмно-зелёный"
-#: fpsstrings.rsdarkpurple
-msgid "dark purple"
-msgstr "темно фиолетовый"
-
#: fpsstrings.rsdarkred
msgid "dark red"
msgstr "тёмно-красный"
-#: fpsstrings.rsdarkteal
-msgid "dark teal"
-msgstr "темно-бирюзовый"
-
#: fpsstrings.rsdefaultsheetname
msgid "Sheet%d"
msgstr "Лист%d"
@@ -157,38 +129,10 @@ msgstr "Формула в ячейке %s не поддерживается фо
msgid "Spreadsheet file"
msgstr "Файл электронной таблицы"
-#: fpsstrings.rsgold
-msgid "gold"
-msgstr "золото"
-
#: fpsstrings.rsgray
msgid "gray"
msgstr "серый"
-#: fpsstrings.rsgray10pct
-msgid "10% gray"
-msgstr "10% серого"
-
-#: fpsstrings.rsgray20pct
-msgid "20% gray"
-msgstr "20% серого"
-
-#: fpsstrings.rsgray25pct
-msgid "25% gray"
-msgstr "25% серого"
-
-#: fpsstrings.rsgray40pct
-msgid "40% gray"
-msgstr "40% серого"
-
-#: fpsstrings.rsgray50pct
-msgid "50% gray"
-msgstr "50% серого"
-
-#: fpsstrings.rsgray80pct
-msgid "80% gray"
-msgstr "80% серого"
-
#: fpsstrings.rsgreen
msgid "green"
msgstr "зелёный"
@@ -197,10 +141,6 @@ msgstr "зелёный"
msgid "Header"
msgstr "Заголовок"
-#: fpsstrings.rsiceblue
-msgid "ice blue"
-msgstr "голубой лед"
-
#: fpsstrings.rsimageformatnotsupported
msgid "Image format not supported."
msgstr "Формат изображения не поддерживается"
@@ -213,10 +153,6 @@ msgstr "Неверная позиция %%G кода в %s"
msgid "Index %d in SST out of range (0-%d)."
msgstr "Индекс %d в SST выходит за пределы диапазона (0-%d)."
-#: fpsstrings.rsindigo
-msgid "indigo"
-msgstr "индиго"
-
#: fpsstrings.rsinvalidargumentcount
msgid "Invalid argument count for function %s"
msgstr "Не верный аргумент для функции %s"
@@ -273,42 +209,10 @@ msgstr "\"%s\" не верный файл электронной таблицы"
msgid "\"%s\" is not a valid worksheet name."
msgstr "\"%s\" не верное имя таблицы."
-#: fpsstrings.rsivory
-msgid "ivory"
-msgstr "слоновая кость"
-
-#: fpsstrings.rslavander
-msgid "lavander"
-msgstr "лаванда"
-
#: fpsstrings.rsleftbracketexpected
msgid "Expected left bracket at position %d, but got %s"
msgstr "Ожидается левая скобка в позиции %d, но найдено %s"
-#: fpsstrings.rslightblue
-msgid "light blue"
-msgstr "светло-голубой"
-
-#: fpsstrings.rslightgreen
-msgid "light green"
-msgstr "светло-зелёный"
-
-#: fpsstrings.rslightorange
-msgid "light orange"
-msgstr "светло-оранжевый"
-
-#: fpsstrings.rslightturquoise
-msgid "light turquoise"
-msgstr "светло-бирюзовый"
-
-#: fpsstrings.rslightyellow
-msgid "light yellow"
-msgstr "светло-жёлтый"
-
-#: fpsstrings.rslime
-msgid "lime"
-msgstr ""
-
#: fpsstrings.rslocalfilehyperlinkabs
msgid "The hyperlink \"%s\" points to a local file. In case of an absolute path the protocol \"file:\" must be specified."
msgstr "Гиперссылка \"%s\" указывает на локальный файл. Необходимо указать протокол \"file:\"."
@@ -329,10 +233,6 @@ msgstr "Таблица содержит %d строк, но указанный
msgid "Export to multiple sheets is possible only if position is restored."
msgstr "Экспорт в несколько листов возможен только в случае если позиция восстанавливается."
-#: fpsstrings.rsnavy
-msgid "navy"
-msgstr ""
-
#: fpsstrings.rsnooperand
msgid "No operand for unary operation %s"
msgstr "Не указан операнд для унарной операции %s"
@@ -373,10 +273,6 @@ msgstr "Не верная строка формата для чисел"
msgid "Identifier %s is not a variable"
msgstr "Идентификатор %s не переменная"
-#: fpsstrings.rsoceanblue
-msgid "ocean blue"
-msgstr ""
-
#: fpsstrings.rsodshyperlinksoftextcellsonly
msgid "Cell %s: OpenDocument supports hyperlinks for text cells only."
msgstr "Ячейка %s: OpenDocument поддерживает гиперссылки только для текстовых ячеек."
@@ -385,10 +281,6 @@ msgstr "Ячейка %s: OpenDocument поддерживает гиперссы
msgid "olive"
msgstr "оливковый"
-#: fpsstrings.rsolivegreen
-msgid "olive green"
-msgstr "оливково-зелёный"
-
#: fpsstrings.rsonlyoneheaderfooterimageallowed
msgid "Only one image per %s section allowed."
msgstr "Разрешено только одно изображения для секции %s."
@@ -401,30 +293,10 @@ msgstr "Эта операция превышает диапазон опреде
msgid "This operation exceeds the range of defined grid rows."
msgstr "Эта операция превышает диапазон определенных столбцов таблицы"
-#: fpsstrings.rsorange
-msgid "orange"
-msgstr "оранжевый"
-
-#: fpsstrings.rspaleblue
-msgid "pale blue"
-msgstr "бледно-голубой"
-
#: fpsstrings.rspaletteindex
msgid "Palette index %d"
msgstr "Индекс палитры %d"
-#: fpsstrings.rsperiwinkle
-msgid "periwinkle"
-msgstr ""
-
-#: fpsstrings.rspink
-msgid "pink"
-msgstr ""
-
-#: fpsstrings.rsplum
-msgid "plum"
-msgstr ""
-
#: fpsstrings.rspurple
msgid "purple"
msgstr ""
@@ -441,34 +313,18 @@ msgstr "красный"
msgid "Expected right bracket at position %d, but got %s"
msgstr "Ожидается правая скобка в позиции %d, но найдено %s"
-#: fpsstrings.rsrose
-msgid "rose"
-msgstr "роза"
-
#: fpsstrings.rsrowstylenotfound
msgid "Row style not found."
msgstr "Стиль строки не найден"
-#: fpsstrings.rsseagreen
-msgid "sea green"
-msgstr "морская волна"
-
#: fpsstrings.rssilver
msgid "silver"
msgstr "серебрянный"
-#: fpsstrings.rsskyblue
-msgid "sky blue"
-msgstr "небесно-голубой"
-
#: fpsstrings.rsstdhyperlinktooltip
msgid "Hold the left mouse button down for a short time to activate the hyperlink."
msgstr "Нажмите и удерживайте некоторое время левую кнопку мышки для активации гиперссылки"
-#: fpsstrings.rstan
-msgid "tan"
-msgstr ""
-
#: fpsstrings.rsteal
msgid "teal"
msgstr ""
@@ -533,18 +389,6 @@ msgstr "Не верное окончание выражения. Найден с
msgid "Expected UTF8 text, but probably ANSI text found in cell %s."
msgstr "Ожидается текст в UTF8 кодировке, но в ячейке %s возможно найден текст ANSI кодировке"
-#: fpsstrings.rsverydarkgreen
-msgid "very dark green"
-msgstr "очень тёмно-зелёный"
-
-#: fpsstrings.rsviolet
-msgid "violet"
-msgstr "фиолетовый"
-
-#: fpsstrings.rswheat
-msgid "wheat"
-msgstr "пшеница"
-
#: fpsstrings.rswhite
msgid "white"
msgstr "белый"