diff --git a/components/tachart/languages/tachartstrconsts.de.po b/components/tachart/languages/tachartstrconsts.de.po
index b7da7006e4..aa0197b52d 100644
--- a/components/tachart/languages/tachartstrconsts.de.po
+++ b/components/tachart/languages/tachartstrconsts.de.po
@@ -29,6 +29,14 @@ msgstr "Zeile löschen"
 msgid "Insert row"
 msgstr "Zeile einfügen"
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr "Nach oben"
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr "Nach unten"
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr "Wert muss eine ganze Zahl sein."
diff --git a/components/tachart/languages/tachartstrconsts.fi.po b/components/tachart/languages/tachartstrconsts.fi.po
index 7d6b0b9d1d..1cd2ff2ca6 100644
--- a/components/tachart/languages/tachartstrconsts.fi.po
+++ b/components/tachart/languages/tachartstrconsts.fi.po
@@ -17,6 +17,14 @@ msgstr "Poista rivi"
 msgid "Insert row"
 msgstr "Lisää rivi"
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/languages/tachartstrconsts.fr.po b/components/tachart/languages/tachartstrconsts.fr.po
index b8d4e6dc15..4e653fe574 100644
--- a/components/tachart/languages/tachartstrconsts.fr.po
+++ b/components/tachart/languages/tachartstrconsts.fr.po
@@ -27,6 +27,14 @@ msgstr "Supprimer la ligne"
 msgid "Insert row"
 msgstr "Insérer une ligne"
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/languages/tachartstrconsts.hu.po b/components/tachart/languages/tachartstrconsts.hu.po
index 6dd9eb732f..ab9637fc73 100644
--- a/components/tachart/languages/tachartstrconsts.hu.po
+++ b/components/tachart/languages/tachartstrconsts.hu.po
@@ -27,6 +27,14 @@ msgstr "Sor törlése"
 msgid "Insert row"
 msgstr "Sor beszúrása"
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/languages/tachartstrconsts.lt.po b/components/tachart/languages/tachartstrconsts.lt.po
index cd0bacde29..d1312736d4 100644
--- a/components/tachart/languages/tachartstrconsts.lt.po
+++ b/components/tachart/languages/tachartstrconsts.lt.po
@@ -28,6 +28,14 @@ msgstr "Šalinti eilutę"
 msgid "Insert row"
 msgstr "Įterpti eilutę"
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/languages/tachartstrconsts.pl.po b/components/tachart/languages/tachartstrconsts.pl.po
index 04ca00430a..644a741a9a 100644
--- a/components/tachart/languages/tachartstrconsts.pl.po
+++ b/components/tachart/languages/tachartstrconsts.pl.po
@@ -28,6 +28,14 @@ msgstr "Usuń wiersz"
 msgid "Insert row"
 msgstr "Wstaw wiersz"
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/languages/tachartstrconsts.pot b/components/tachart/languages/tachartstrconsts.pot
index 2163a05ea6..6a775d9fc6 100644
--- a/components/tachart/languages/tachartstrconsts.pot
+++ b/components/tachart/languages/tachartstrconsts.pot
@@ -17,6 +17,14 @@ msgstr ""
 msgid "Insert row"
 msgstr ""
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/languages/tachartstrconsts.pt_BR.po b/components/tachart/languages/tachartstrconsts.pt_BR.po
index 96bec83a54..a88fff7d5f 100644
--- a/components/tachart/languages/tachartstrconsts.pt_BR.po
+++ b/components/tachart/languages/tachartstrconsts.pt_BR.po
@@ -27,6 +27,14 @@ msgstr "Excluir linha"
 msgid "Insert row"
 msgstr "Inserir linha"
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/languages/tachartstrconsts.ru.po b/components/tachart/languages/tachartstrconsts.ru.po
index b36b815b26..68beb1f9d2 100644
--- a/components/tachart/languages/tachartstrconsts.ru.po
+++ b/components/tachart/languages/tachartstrconsts.ru.po
@@ -27,6 +27,14 @@ msgstr "Удалить строку"
 msgid "Insert row"
 msgstr "Вставить строку"
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/languages/tachartstrconsts.se.po b/components/tachart/languages/tachartstrconsts.se.po
index 4644c171b4..2500c96512 100644
--- a/components/tachart/languages/tachartstrconsts.se.po
+++ b/components/tachart/languages/tachartstrconsts.se.po
@@ -28,6 +28,14 @@ msgstr ""
 msgid "Insert row"
 msgstr ""
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/languages/tachartstrconsts.uk.po b/components/tachart/languages/tachartstrconsts.uk.po
index 3fb912567f..b75fc8481b 100644
--- a/components/tachart/languages/tachartstrconsts.uk.po
+++ b/components/tachart/languages/tachartstrconsts.uk.po
@@ -30,6 +30,14 @@ msgstr "Видалити рядок"
 msgid "Insert row"
 msgstr "Вставити рядок"
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/languages/tachartstrconsts.zh_CN.po b/components/tachart/languages/tachartstrconsts.zh_CN.po
index d6d21a0276..f9d9586146 100644
--- a/components/tachart/languages/tachartstrconsts.zh_CN.po
+++ b/components/tachart/languages/tachartstrconsts.zh_CN.po
@@ -28,6 +28,14 @@ msgstr "删除行"
 msgid "Insert row"
 msgstr "插入行"
 
+#: tachartstrconsts.desmovedown
+msgid "Move down"
+msgstr ""
+
+#: tachartstrconsts.desmoveup
+msgid "Move up"
+msgstr ""
+
 #: tachartstrconsts.desnointeger
 msgid "Value must be an integer."
 msgstr ""
diff --git a/components/tachart/tachartstrconsts.pas b/components/tachart/tachartstrconsts.pas
index 1c811fbf68..05ef6f839a 100644
--- a/components/tachart/tachartstrconsts.pas
+++ b/components/tachart/tachartstrconsts.pas
@@ -36,6 +36,8 @@ resourcestring
   desText = 'Text';
   desInsertRow = 'Insert row';
   desDeleteRow = 'Delete row';
+  desMoveUp = 'Move up';
+  desMoveDown = 'Move down';
   desNoNumber = 'Non-numeric value.';
   desNoInteger = 'Value must be an integer.';
 
diff --git a/components/tachart/tadatapointseditor.lfm b/components/tachart/tadatapointseditor.lfm
index 0664a6aac1..e14de5d50e 100644
--- a/components/tachart/tadatapointseditor.lfm
+++ b/components/tachart/tadatapointseditor.lfm
@@ -81,6 +81,17 @@ object DataPointsEditorForm: TDataPointsEditorForm
       Caption = 'Delete row'
       OnClick = miDeleteRowClick
     end
+    object miSeparator: TMenuItem
+      Caption = '-'
+    end
+    object miMoveUp: TMenuItem
+      Caption = 'Move up'
+      OnClick = miMoveUpClick
+    end
+    object miMoveDown: TMenuItem
+      Caption = 'Move down'
+      OnClick = miMoveDownClick
+    end
   end
   object cdItemColor: TColorDialog
     Color = clBlack
diff --git a/components/tachart/tadatapointseditor.pas b/components/tachart/tadatapointseditor.pas
index ac834d9d02..f687c3d7c5 100644
--- a/components/tachart/tadatapointseditor.pas
+++ b/components/tachart/tadatapointseditor.pas
@@ -24,6 +24,9 @@ type
   TDataPointsEditorForm = class(TForm)
     ButtonPanel1: TButtonPanel;
     cdItemColor: TColorDialog;
+    miMoveDown: TMenuItem;
+    miMoveUp: TMenuItem;
+    miSeparator: TMenuItem;
     miInsertRow: TMenuItem;
     miDeleteRow: TMenuItem;
     pmRows: TPopupMenu;
@@ -31,6 +34,8 @@ type
     procedure FormCreate(Sender: TObject);
     procedure miDeleteRowClick(Sender: TObject);
     procedure miInsertRowClick(Sender: TObject);
+    procedure miMoveDownClick(Sender: TObject);
+    procedure miMoveUpClick(Sender: TObject);
     procedure OKButtonClick(Sender: TObject);
     procedure pmRowsPopup(Sender: TObject);
     procedure sgDataButtonClick(ASender: TObject; ACol, ARow: Integer);
@@ -44,6 +49,7 @@ type
     FDataPoints: TStrings;
     FXCount: Integer;
     FYCount: Integer;
+    procedure UpdateCmds;
     function ValidData(out ACol, ARow: Integer; out AMsg: String): Boolean;
   public
     procedure InitData(AXCount, AYCount: Integer; ADataPoints: TStrings);
@@ -148,6 +154,8 @@ begin
   sgData.Columns[2].Title.Caption := desText;
   miInsertRow.Caption := desInsertRow;
   miDeleteRow.Caption := desDeleteRow;
+  miMoveUp.Caption := desMoveUp;
+  miMoveDown.Caption := desMoveDown;
 end;
 
 procedure TDataPointsEditorForm.miInsertRowClick(Sender: TObject);
@@ -155,6 +163,18 @@ begin
   sgData.InsertColRow(false, FCurrentRow);
 end;
 
+procedure TDataPointsEditorForm.miMoveDownClick(Sender: TObject);
+begin
+  if sgData.Row < sgData.RowCount-1 then
+    sgData.ExchangeColRow(false, sgData.Row, sgData.Row+1);
+end;
+
+procedure TDataPointsEditorForm.miMoveUpClick(Sender: TObject);
+begin
+  if sgData.Row > 1 then
+    sgData.ExchangeColRow(false, sgData.Row, sgData.Row-1);
+end;
+
 procedure TDataPointsEditorForm.OKButtonClick(Sender: TObject);
 var
   c, r: Integer;
@@ -175,6 +195,7 @@ begin
   if not InRange(FCurrentRow, 1, sgData.RowCount - 1) then
     Abort;
   sgData.Row := FCurrentRow;
+  UpdateCmds;
 end;
 
 procedure TDataPointsEditorForm.sgDataButtonClick(
@@ -215,6 +236,13 @@ begin
   end;
 end;
 
+procedure TDataPointsEditorForm.UpdateCmds;
+begin
+  miDeleteRow.Enabled := sgData.Row > 0;
+  miMoveUp.Enabled := sgData.Row > 1;
+  miMovedown.Enabled := sgData.Row < sgData.RowCount-1;
+end;
+
 function TDataPointsEditorForm.ValidData(out ACol, ARow: Integer;
   out AMsg: String): Boolean;
 var
diff --git a/components/tachart/tagraph.pas b/components/tachart/tagraph.pas
index 1b7fd4b384..3c15013fbd 100644
--- a/components/tachart/tagraph.pas
+++ b/components/tachart/tagraph.pas
@@ -307,7 +307,7 @@ type
     {$ENDIF}
     procedure Notification(
       AComponent: TComponent; AOperation: TOperation); override;
-      procedure PrepareAxis(ADrawer: IChartDrawer);
+    procedure PrepareAxis(ADrawer: IChartDrawer);
     function PrepareLegend(
       ADrawer: IChartDrawer; var AClipRect: TRect): TChartLegendDrawingData;
     procedure SetBiDiMode(AValue: TBiDiMode); override;