diff --git a/components/editortoolbar/editortoolbar.lpk b/components/editortoolbar/editortoolbar.lpk
index e95674b2a2..0d2dbd1eca 100644
--- a/components/editortoolbar/editortoolbar.lpk
+++ b/components/editortoolbar/editortoolbar.lpk
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Package Version="4">
     <Name Value="editortoolbar"/>
@@ -14,9 +14,6 @@
           <UseAnsiStrings Value="False"/>
         </SyntaxOptions>
       </Parsing>
-      <Other>
-        <CompilerPath Value="$(CompPath)"/>
-      </Other>
     </CompilerOptions>
     <Description Value="Editor Toolbar
 "/>
@@ -72,5 +69,8 @@
       <Version Value="2"/>
       <IgnoreBinaries Value="False"/>
     </PublishOptions>
+    <CustomOptions Items="ExternHelp" Version="2">
+      <_ExternHelp Items="Count"/>
+    </CustomOptions>
   </Package>
 </CONFIG>
diff --git a/components/editortoolbar/editortoolbar_impl.pas b/components/editortoolbar/editortoolbar_impl.pas
index 779f25a22c..14d23b290f 100644
--- a/components/editortoolbar/editortoolbar_impl.pas
+++ b/components/editortoolbar/editortoolbar_impl.pas
@@ -42,7 +42,6 @@ const
   cSettingsFile = 'editortoolbar.xml';
   cDivider      = '---------------';
 
-
 type
 
   { TEditorToolbar }
@@ -90,6 +89,10 @@ type
 
 procedure Register;
 
+var
+  sToolbarPos: string;
+  bToolBarShow: boolean;
+
 implementation
 
 {$R toolbar.res}    // all required images
@@ -121,6 +124,12 @@ type
 var
   uEditorToolbarList: TEditorToolbarList;
 
+procedure ConfigureToolbar (Sender:TObject);
+begin
+  if TEdtTbConfigForm.Execute then
+    uEditorToolbarList.ReloadAll;
+end;
+
 procedure TEditToolBarToolButton.Click;
 begin
   inherited Click;
@@ -176,6 +185,8 @@ end;
 
 procedure TEditorToolbar.CreateEditorToolbar(AW: TForm; var ATB: TToolbar);
 begin
+  { It must be created with Align = alTop, so that the first positioning
+  of buttons is correct. }
   ATB := TToolbar.Create(AW);
   ATB.Parent   := AW;
   ATB.Height   := 26;
@@ -202,6 +213,9 @@ end;
 constructor TEditorToolbar.Create(AOwner: TComponent);
 var
   T: TJumpType;
+  c: integer;
+  cfg: TConfigStorage;
+  value: string;
 begin
   uEditorToolbarList.AddBar(Self);
   if assigned(TB) then exit;
@@ -215,6 +229,17 @@ begin
     PM.Items.Add(CreateJumpItem(T, FWindow));
 
   AddStaticItems;
+  // Let's verify if it's a first start
+  c:= 0; // Just in case...
+  cfg := GetIDEConfigStorage(cSettingsFile, True);
+  try
+    c := cfg.GetValue('Count', 0);
+  finally
+    cfg.Free;
+  end;
+  if c = 0 then
+    TEdtTbConfigForm.Setup;
+
   AddCustomItems;
 end;
 
@@ -278,6 +303,29 @@ var
   cfg: TConfigStorage;
   value: string;
   mi: TIDEMenuItem;
+
+procedure SetTbPos;
+begin
+case sToolbarPos of
+    'Top': begin
+      TB.Align:= alTop;
+      TB.Height:= 26;
+      end;
+    'Bottom': begin
+      TB.Align:= alBottom;
+      TB.Height:= 26;
+      end;
+    'Left': begin
+      TB.Align:= alLeft;
+      TB.Width:= 26;
+      end;
+    'Right': begin
+      TB.Align:= alRight;
+      TB.Width:= 26;
+      end;
+  end;
+end;
+
 begin
   cfg := GetIDEConfigStorage(cSettingsFile, True);
   TB.BeginUpdate;
@@ -297,11 +345,15 @@ begin
             AddButton(mi);
         end;
        end;
-  end;
+    end;
+    sToolbarPos := cfg.GetValue('Position','Top');
+    bToolBarShow:= cfg.GetValue('Visible',true);
+    SetTbPos;
   finally
     cfg.Free;
     TB.EndUpdate;
   end;
+  TB.Visible:= bToolBarShow;
 end;
 
 procedure TEditorToolbar.AddDivider;
@@ -365,14 +417,25 @@ begin
 end;
 
 procedure Register;
+var
+  MenuCommand:TIDEMenuCommand;
+  MenuIcon: string;
 begin
-  if uEditorToolbarList = nil then
+  MenuIcon:= 'menu_editor_options';
+  //MenuIcon:= 'menu_editor_toolbar'; TODO!
+  if uEditorToolbarList = nil then begin
     TEditorToolbarList.Create;
+    MenuCommand:= RegisterIDEMenuCommand(itmViewMainWindows,'EditorToolBar',rsEditorToolbar,nil,@ConfigureToolbar);
+    MenuCommand.ImageIndex := IDEImages.LoadImage(16, MenuIcon);
+  end;
+
 end;
 
 
 initialization
   uEditorToolbarList := nil;
+  sToolbarPos:= 'Top';
+  bToolBarShow:= True;
 
 finalization
   uEditorToolbarList.Free;
diff --git a/components/editortoolbar/editortoolbar_str.pas b/components/editortoolbar/editortoolbar_str.pas
index 57577e6ffd..5bc29c0295 100644
--- a/components/editortoolbar/editortoolbar_str.pas
+++ b/components/editortoolbar/editortoolbar_str.pas
@@ -21,6 +21,17 @@ resourcestring
   rsRemoveSelected          = 'Remove selected item from toolbar';
   rsMoveSelectedUp          = 'Move selected toolbar item up';
   rsMoveSelectedDown        = 'Move selected toolbar item down';
+  rsPosition                = 'Position';
+  rsTop                     = 'Top';
+  rsBottom                  = 'Bottom';
+  rsLeft                    = 'Left';
+  rsRight                   = 'Right';
+  rsVisible                 = 'Visible';
+  rsShowHide                = 'Show/Hide Toolbar';
+  rsWarning                 = 'You''ve chosen to hide the toolbar. ' +
+    'You may access the toolbar configuration via "%s" -> "%s" main menu';
+  rsEditorToolbar           = 'Editor ToolBar';
+  rsMenuView                = 'View';
 
 implementation
 
diff --git a/components/editortoolbar/edttbconfigfrm.lfm b/components/editortoolbar/edttbconfigfrm.lfm
index 0c255e2432..d1f3cf3959 100644
--- a/components/editortoolbar/edttbconfigfrm.lfm
+++ b/components/editortoolbar/edttbconfigfrm.lfm
@@ -3,17 +3,16 @@ object EdtTbConfigForm: TEdtTbConfigForm
   Height = 437
   Top = 200
   Width = 651
-  ActiveControl = FilterEdit
   Caption = 'EdtTbConfigForm'
   ClientHeight = 437
   ClientWidth = 651
   OnCreate = FormCreate
-  LCLVersion = '1.1'
+  LCLVersion = '1.3'
   object lblMenuTree: TLabel
     Left = 16
-    Height = 15
-    Top = 10
-    Width = 69
+    Height = 17
+    Top = 14
+    Width = 80
     Caption = 'lblMenuTree'
     ParentColor = False
   end
@@ -21,9 +20,9 @@ object EdtTbConfigForm: TEdtTbConfigForm
     AnchorSideLeft.Control = btnAdd
     AnchorSideLeft.Side = asrBottom
     Left = 456
-    Height = 15
-    Top = 10
-    Width = 55
+    Height = 17
+    Top = 14
+    Width = 61
     BorderSpacing.Left = 13
     Caption = 'lblToolbar'
     ParentColor = False
@@ -38,7 +37,6 @@ object EdtTbConfigForm: TEdtTbConfigForm
     Width = 22
     BorderSpacing.Top = 1
     Enabled = False
-    NumGlyphs = 0
     OnClick = btnRemoveClick
     ShowHint = True
     ParentShowHint = False
@@ -54,7 +52,6 @@ object EdtTbConfigForm: TEdtTbConfigForm
     BorderSpacing.Left = 13
     BorderSpacing.Top = 1
     Enabled = False
-    NumGlyphs = 0
     OnClick = btnAddClick
     ShowHint = True
     ParentShowHint = False
@@ -66,7 +63,6 @@ object EdtTbConfigForm: TEdtTbConfigForm
     Top = 157
     Width = 22
     Enabled = False
-    NumGlyphs = 0
     OnClick = btnMoveUpClick
     ShowHint = True
     ParentShowHint = False
@@ -81,7 +77,6 @@ object EdtTbConfigForm: TEdtTbConfigForm
     Width = 22
     BorderSpacing.Top = 1
     Enabled = False
-    NumGlyphs = 0
     OnClick = btnMoveDownClick
     ShowHint = True
     ParentShowHint = False
@@ -109,7 +104,7 @@ object EdtTbConfigForm: TEdtTbConfigForm
       AnchorSideRight.Control = btnCancel
       AnchorSideBottom.Control = pnlButtons
       AnchorSideBottom.Side = asrBottom
-      Left = 488
+      Left = 474
       Height = 25
       Top = 11
       Width = 75
@@ -131,10 +126,10 @@ object EdtTbConfigForm: TEdtTbConfigForm
       AnchorSideRight.Side = asrBottom
       AnchorSideBottom.Control = pnlButtons
       AnchorSideBottom.Side = asrBottom
-      Left = 569
+      Left = 555
       Height = 25
       Top = 11
-      Width = 76
+      Width = 90
       Anchors = [akRight, akBottom]
       AutoSize = True
       BorderSpacing.Right = 6
@@ -146,15 +141,16 @@ object EdtTbConfigForm: TEdtTbConfigForm
       Constraints.MinHeight = 25
       Constraints.MinWidth = 75
       ModalResult = 2
+      OnClick = btnCancelClick
       TabOrder = 1
     end
   end
   object btnAddDivider: TButton
     AnchorSideBottom.Control = pnlButtons
-    Left = 504
+    Left = 484
     Height = 25
     Top = 364
-    Width = 96
+    Width = 116
     Anchors = [akRight, akBottom]
     AutoSize = True
     BorderSpacing.Around = 6
@@ -171,8 +167,8 @@ object EdtTbConfigForm: TEdtTbConfigForm
     AnchorSideTop.Control = TV
     AnchorSideBottom.Control = btnAddDivider
     Left = 456
-    Height = 301
-    Top = 57
+    Height = 288
+    Top = 70
     Width = 183
     Anchors = [akTop, akLeft, akRight, akBottom]
     BorderSpacing.Bottom = 6
@@ -186,8 +182,8 @@ object EdtTbConfigForm: TEdtTbConfigForm
     AnchorSideTop.Side = asrBottom
     AnchorSideBottom.Control = pnlButtons
     Left = 16
-    Height = 332
-    Top = 57
+    Height = 319
+    Top = 70
     Width = 392
     Anchors = [akTop, akLeft, akBottom]
     BorderSpacing.Top = 6
@@ -203,16 +199,53 @@ object EdtTbConfigForm: TEdtTbConfigForm
     AnchorSideTop.Control = lblMenuTree
     AnchorSideTop.Side = asrBottom
     Left = 16
-    Height = 20
-    Top = 31
+    Height = 27
+    Top = 37
     Width = 192
     UseFormActivate = True
     ButtonWidth = 23
-    NumGlyphs = 0
+    NumGlyphs = 1
     BorderSpacing.Top = 6
     MaxLength = 0
+    ParentFont = False
     TabOrder = 0
     FilteredTreeview = TV
     ExpandAllInitially = True
   end
+  object cbPos: TComboBox
+    Left = 312
+    Height = 27
+    Top = 10
+    Width = 100
+    ItemHeight = 0
+    ItemIndex = 0
+    Items.Strings = (
+      'Top'
+      'Bottom'
+      'Right'
+      'Left'
+    )
+    OnChange = cbPosChange
+    TabOrder = 5
+    Text = 'Top'
+  end
+  object lblpos: TLabel
+    Left = 240
+    Height = 17
+    Top = 14
+    Width = 37
+    Caption = 'lblpos'
+    ParentColor = False
+  end
+  object cbVisible: TCheckBox
+    Left = 316
+    Height = 23
+    Top = 45
+    Width = 69
+    Caption = 'Visible'
+    OnChange = cbVisibleChange
+    ParentShowHint = False
+    ShowHint = True
+    TabOrder = 6
+  end
 end
diff --git a/components/editortoolbar/edttbconfigfrm.pas b/components/editortoolbar/edttbconfigfrm.pas
index 1369a690b8..14d10bfbd6 100644
--- a/components/editortoolbar/edttbconfigfrm.pas
+++ b/components/editortoolbar/edttbconfigfrm.pas
@@ -39,12 +39,18 @@ type
     btnCancel: TButton;
     btnAddDivider: TButton;
     btnRemove: TSpeedButton;
+    cbPos: TComboBox;
+    cbVisible: TCheckBox;
+    lblpos: TLabel;
     lblMenuTree: TLabel;
     lblToolbar: TLabel;
     lbToolbar: TListBox;
     pnlButtons: TPanel;
     FilterEdit: TTreeFilterEdit;
     TV: TTreeView;
+    procedure btnCancelClick(Sender: TObject);
+    procedure cbPosChange(Sender: TObject);
+    procedure cbVisibleChange(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure lbToolbarSelectionChange(Sender: TObject; User: boolean);
     procedure btnAddClick(Sender: TObject);
@@ -55,6 +61,8 @@ type
     procedure btnRemoveClick(Sender: TObject);
     procedure TVSelectionChanged(Sender: TObject);
   private
+    FToolBarPos: string;
+    FToolBarShow: boolean;
     procedure SetupCaptions;
     procedure LoadCategories;
     procedure LoadSettings;
@@ -62,8 +70,13 @@ type
     procedure AddMenuItem(ParentNode: TTreeNode; Item: TIDEMenuItem);
   public
     class function Execute: boolean;
+    class procedure Setup;
   end; 
 
+Var
+  sPosValues: array[0..3] of string = ('Top','Bottom','Right','Left');
+  sLocalizedPosValues: array[0..3] of string;
+  sMenuView: string = 'View';
 
 implementation
 
@@ -72,6 +85,34 @@ implementation
 uses
   editortoolbar_impl, LazConfigStorage, BaseIDEIntf, LazIDEIntf, IDEImagesIntf;
 
+{
+Function IndexFromLocalized (var AValue: string): Integer;
+var
+  i:Integer;
+begin
+ for i:= 0 to 3 do begin
+   if AValue = sLocalizedPosValues[i] then begin
+    Result := I;
+    exit;
+   end;
+ end;
+ Result := 0; // default is Top
+end;
+}
+
+Function IndexFromEnglish (var AValue: string): Integer;
+var
+  i:Integer;
+begin
+ for i:= 0 to 3 do begin
+   if AValue = sPosValues[i] then begin
+    Result := I;
+    exit;
+   end;
+ end;
+ Result := 0; // default is Top
+end;
+
 { TEdtTbConfigForm }
 
 procedure TEdtTbConfigForm.FormCreate(Sender: TObject);
@@ -89,6 +130,7 @@ begin
   btnRemove.Hint   := rsRemoveSelected;
   btnMoveUp.Hint   := rsMoveSelectedUp;
   btnMoveDown.Hint := rsMoveSelectedDown;
+  cbVisible.Hint   := rsShowHide;
 
   TV.Images := IDEImages.Images_16;
   SetupCaptions;
@@ -96,6 +138,25 @@ begin
   LoadSettings;
 end;
 
+procedure TEdtTbConfigForm.cbPosChange(Sender: TObject);
+var
+  i: Integer;
+begin
+  i:= cbPos.ItemIndex;
+  if i >= 0 then begin
+    FToolbarPos:= sPosValues[i];
+  end;
+end;
+
+procedure TEdtTbConfigForm.btnCancelClick(Sender: TObject);
+begin
+end;
+
+procedure TEdtTbConfigForm.cbVisibleChange(Sender: TObject);
+begin
+  FToolBarShow:= cbVisible.Checked;
+end;
+
 procedure TEdtTbConfigForm.lbToolbarSelectionChange(Sender: TObject; User: boolean);
 var
   i: Integer;
@@ -167,9 +228,12 @@ end;
 procedure TEdtTbConfigForm.btnOKClick(Sender: TObject);
 begin
   SaveSettings;
+  if not FToolBarShow then ShowMessage(Format(rsWarning,[sMenuView,rsEditorToolbar]));
 end;
 
 procedure TEdtTbConfigForm.SetupCaptions;
+var
+  i: integer;
 begin
   Caption               := rsEditorToolbarConfigForm;
   btnOK.Caption         := rsOK;
@@ -177,6 +241,16 @@ begin
   btnAddDivider.Caption := rsAddDivider;
   lblMenuTree.Caption   := rsMenuTree;
   lblToolbar.Caption    := rsToolbar;
+  lblpos.Caption        := rsPosition;
+  cbVisible.Caption     := rsVisible;
+  sLocalizedPosValues[0] := rsTop;
+  sLocalizedPosValues[1] := rsBottom;
+  sLocalizedPosValues[2] := rsRight;
+  sLocalizedPosValues[3] := rsLeft;
+  for i := 0 to 3 do
+  begin
+   cbPos.Items[i] := sLocalizedPosValues[i]; // localized
+  end;
 end;
 
 procedure TEdtTbConfigForm.LoadCategories;
@@ -204,25 +278,44 @@ begin
   cfg := GetIDEConfigStorage(cSettingsFile, True);
   try
     c := cfg.GetValue('Count', 0);
-    for i := 0 to c - 1 do
-    begin
-      value := cfg.GetValue('Button' + Format('%2.2d', [i+1]) + '/Value', '');
-      if value <> '' then
-      begin
-       if value = cDivider then
+    if c = 0 then begin
+      // Let's provide a Jump Back/Jump Forward as a starting default
+      value := 'IDEMainMenu/Search/itmJumpings/itmJumpBack';
+      mi := IDEMenuRoots.FindByPath(value, false);
+      if Assigned(mi) then
+        lbToolbar.Items.AddObject(mi.Caption, TObject(mi));
+      value := 'IDEMainMenu/Search/itmJumpings/itmJumpForward';
+      mi := IDEMenuRoots.FindByPath(value, false);
+      if Assigned(mi) then
+        lbToolbar.Items.AddObject(mi.Caption, TObject(mi));
+    end
+    else begin
+     for i := 0 to c - 1 do
+     begin
+       value := cfg.GetValue('Button' + Format('%2.2d', [i+1]) + '/Value', '');
+       if value <> '' then
        begin
-         lbToolbar.Items.Add(value);
-         Continue;
+        if value = cDivider then
+        begin
+          lbToolbar.Items.Add(value);
+          Continue;
+        end;
+
+        mi := IDEMenuRoots.FindByPath(value, false);
+        if Assigned(mi) then
+          lbToolbar.Items.AddObject(mi.Caption, TObject(mi));
        end;
-      
-       mi := IDEMenuRoots.FindByPath(value, false);
-       if Assigned(mi) then
-         lbToolbar.Items.AddObject(mi.Caption, TObject(mi));
-      end;
+     end;
     end;
+    value := cfg.GetValue('Position','Top');
+    FToolbarPos:= value;
+    FToolBarShow:= cfg.GetValue('Visible',true);
   finally
     cfg.Free;
   end;
+  i := IndexFromEnglish(FToolBarPos);
+  cbPos.Text:= sLocalizedPosValues[i];
+  cbVisible.Checked:= FToolBarShow;
 end;
 
 procedure TEdtTbConfigForm.SaveSettings;
@@ -240,6 +333,8 @@ begin
       else
         cfg.SetDeleteValue('Button' + Format('%2.2d', [i+1]) + '/Value', TIDEMenuItem(lbToolbar.Items.Objects[i]).GetPath, '');
     end;
+    cfg.SetValue('Position', FToolbarPos);
+    cfg.SetValue('Visible',FToolBarShow);
     cfg.WriteToDisk;
   finally
     cfg.Free;
@@ -257,6 +352,8 @@ begin
   n.SelectedIndex := Item.ImageIndex;
   if Item is TIDEMenuSection then
   begin
+    // get the caption of the View entry for the appropriate Warning
+    if Item.Name = 'View' then sMenuView:= Item.Caption;
     sec := (Item as TIDEMenuSection);
     for i := 0 to sec.Count-1 do
       AddMenuItem(n, sec.Items[i]);
@@ -277,5 +374,18 @@ begin
   end;
 end;
 
+class procedure TEdtTbConfigForm.Setup;
+var
+  frm: TEdtTbConfigForm;
+begin
+  frm := TEdtTbConfigForm.Create(nil);
+  try
+    frm.SaveSettings;
+  finally
+    frm.Free;
+  end;
+
+end;
+
 end.
 
diff --git a/components/editortoolbar/languages/editortoolbar_str.cs.po b/components/editortoolbar/languages/editortoolbar_str.cs.po
index 189112884f..d94e359ce8 100644
--- a/components/editortoolbar/languages/editortoolbar_str.cs.po
+++ b/components/editortoolbar/languages/editortoolbar_str.cs.po
@@ -18,6 +18,10 @@ msgstr "Přidat oddělovač"
 msgid "Add selected item to toolbar"
 msgstr "Přidat vybranou položku na panel"
 
+#: editortoolbar_str.rsbottom
+msgid "Bottom"
+msgstr ""
+
 #: editortoolbar_str.rscancel
 msgid "Cancel"
 msgstr "Zrušit"
@@ -26,6 +30,10 @@ msgstr "Zrušit"
 msgid "Configure Toolbar"
 msgstr "Nastavení panelu nástrojů"
 
+#: editortoolbar_str.rseditortoolbar
+msgid "Editor ToolBar"
+msgstr ""
+
 #: editortoolbar_str.rseditortoolbarconfigform
 msgid "Editor Toolbar Configuration"
 msgstr "[Editor] Konfigurace panelu nástrojů"
@@ -34,10 +42,18 @@ msgstr "[Editor] Konfigurace panelu nástrojů"
 msgid "Jump To"
 msgstr "Skok na"
 
+#: editortoolbar_str.rsleft
+msgid "Left"
+msgstr ""
+
 #: editortoolbar_str.rsmenutree
 msgid "Available Menu Items"
 msgstr "Dostupné položky menu:"
 
+#: editortoolbar_str.rsmenuview
+msgid "View"
+msgstr ""
+
 #: editortoolbar_str.rsmoveselecteddown
 msgid "Move selected toolbar item down"
 msgstr "Posunout položku dolů"
@@ -50,14 +66,38 @@ msgstr "Posunout vybranou nahoru"
 msgid "OK"
 msgstr "OK"
 
+#: editortoolbar_str.rsposition
+msgid "Position"
+msgstr ""
+
 #: editortoolbar_str.rsremoveselected
 msgid "Remove selected item from toolbar"
 msgstr "Odstranit položku z panelu nástrojů"
 
+#: editortoolbar_str.rsright
+msgid "Right"
+msgstr ""
+
+#: editortoolbar_str.rsshowhide
+msgid "Show/Hide Toolbar"
+msgstr ""
+
 #: editortoolbar_str.rstoolbar
 msgid "Toolbar Items"
 msgstr "Aktivní položky:"
 
+#: editortoolbar_str.rstop
+msgid "Top"
+msgstr ""
+
+#: editortoolbar_str.rsvisible
+msgid "Visible"
+msgstr ""
+
+#: editortoolbar_str.rswarning
+msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via \"%s\" -> \"%s\" main menu"
+msgstr ""
+
 #: editortoolbar_str.serrcouldnotfind
 msgid "Could not find <%s>"
 msgstr "Nemohu najít <%s>"
diff --git a/components/editortoolbar/languages/editortoolbar_str.de.po b/components/editortoolbar/languages/editortoolbar_str.de.po
index e2fce275f4..f176c9ae92 100644
--- a/components/editortoolbar/languages/editortoolbar_str.de.po
+++ b/components/editortoolbar/languages/editortoolbar_str.de.po
@@ -18,6 +18,10 @@ msgstr "Trenner hinzufügen"
 msgid "Add selected item to toolbar"
 msgstr "Gewähltes Element zur Toolbar hinzufügen"
 
+#: editortoolbar_str.rsbottom
+msgid "Bottom"
+msgstr ""
+
 #: editortoolbar_str.rscancel
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -26,6 +30,10 @@ msgstr "Abbrechen"
 msgid "Configure Toolbar"
 msgstr "Toolbar konfigurieren"
 
+#: editortoolbar_str.rseditortoolbar
+msgid "Editor ToolBar"
+msgstr ""
+
 #: editortoolbar_str.rseditortoolbarconfigform
 msgid "Editor Toolbar Configuration"
 msgstr "Editor-Toolbar-Konfiguration"
@@ -34,11 +42,19 @@ msgstr "Editor-Toolbar-Konfiguration"
 msgid "Jump To"
 msgstr "Springe zu"
 
+#: editortoolbar_str.rsleft
+msgid "Left"
+msgstr ""
+
 #: editortoolbar_str.rsmenutree
 #| msgid "Menu Tree"
 msgid "Available Menu Items"
 msgstr "Verfügbare Menüelemente"
 
+#: editortoolbar_str.rsmenuview
+msgid "View"
+msgstr ""
+
 #: editortoolbar_str.rsmoveselecteddown
 msgid "Move selected toolbar item down"
 msgstr "Gewähltes Toolbar-Element nach unten bewegen"
@@ -51,15 +67,39 @@ msgstr "Gewähltes Toolbar-Element nach oben bewegen"
 msgid "OK"
 msgstr "OK"
 
+#: editortoolbar_str.rsposition
+msgid "Position"
+msgstr ""
+
 #: editortoolbar_str.rsremoveselected
 msgid "Remove selected item from toolbar"
 msgstr "Gewähltes Element aus der Toolbar entfernen"
 
+#: editortoolbar_str.rsright
+msgid "Right"
+msgstr ""
+
+#: editortoolbar_str.rsshowhide
+msgid "Show/Hide Toolbar"
+msgstr ""
+
 #: editortoolbar_str.rstoolbar
 #| msgid "Toolbar"
 msgid "Toolbar Items"
 msgstr "Toolbar-Elemente"
 
+#: editortoolbar_str.rstop
+msgid "Top"
+msgstr ""
+
+#: editortoolbar_str.rsvisible
+msgid "Visible"
+msgstr ""
+
+#: editortoolbar_str.rswarning
+msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via \"%s\" -> \"%s\" main menu"
+msgstr ""
+
 #: editortoolbar_str.serrcouldnotfind
 msgid "Could not find <%s>"
 msgstr "Kann <%s> nicht finden"
diff --git a/components/editortoolbar/languages/editortoolbar_str.es.po b/components/editortoolbar/languages/editortoolbar_str.es.po
index 81757e5855..e5b8fe0670 100644
--- a/components/editortoolbar/languages/editortoolbar_str.es.po
+++ b/components/editortoolbar/languages/editortoolbar_str.es.po
@@ -17,6 +17,10 @@ msgstr "Añadir divisor"
 msgid "Add selected item to toolbar"
 msgstr "Añadir elemento seleccionado a la barra de herramientas"
 
+#: editortoolbar_str.rsbottom
+msgid "Bottom"
+msgstr ""
+
 #: editortoolbar_str.rscancel
 msgid "Cancel"
 msgstr "Cancelar"
@@ -25,6 +29,10 @@ msgstr "Cancelar"
 msgid "Configure Toolbar"
 msgstr "Configurar la barra de herramientas"
 
+#: editortoolbar_str.rseditortoolbar
+msgid "Editor ToolBar"
+msgstr ""
+
 #: editortoolbar_str.rseditortoolbarconfigform
 msgid "Editor Toolbar Configuration"
 msgstr "Editor de la configuración de Barra de herramientas"
@@ -33,10 +41,18 @@ msgstr "Editor de la configuración de Barra de herramientas"
 msgid "Jump To"
 msgstr "Saltar a"
 
+#: editortoolbar_str.rsleft
+msgid "Left"
+msgstr ""
+
 #: editortoolbar_str.rsmenutree
 msgid "Available Menu Items"
 msgstr "Elementos de menú disponibles"
 
+#: editortoolbar_str.rsmenuview
+msgid "View"
+msgstr ""
+
 #: editortoolbar_str.rsmoveselecteddown
 msgid "Move selected toolbar item down"
 msgstr "Bajar el elemento seleccionado en la barra de herramientas"
@@ -49,14 +65,38 @@ msgstr "Subir elemento seleccionado en la barra de herramientas"
 msgid "OK"
 msgstr "OK"
 
+#: editortoolbar_str.rsposition
+msgid "Position"
+msgstr ""
+
 #: editortoolbar_str.rsremoveselected
 msgid "Remove selected item from toolbar"
 msgstr "Eliminar el elemento seleccionado de la barra de herramientas"
 
+#: editortoolbar_str.rsright
+msgid "Right"
+msgstr ""
+
+#: editortoolbar_str.rsshowhide
+msgid "Show/Hide Toolbar"
+msgstr ""
+
 #: editortoolbar_str.rstoolbar
 msgid "Toolbar Items"
 msgstr "Elementos de la barra de herramientas"
 
+#: editortoolbar_str.rstop
+msgid "Top"
+msgstr ""
+
+#: editortoolbar_str.rsvisible
+msgid "Visible"
+msgstr ""
+
+#: editortoolbar_str.rswarning
+msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via \"%s\" -> \"%s\" main menu"
+msgstr ""
+
 #: editortoolbar_str.serrcouldnotfind
 msgid "Could not find <%s>"
 msgstr "No se pudo encontrar <%s>"
diff --git a/components/editortoolbar/languages/editortoolbar_str.hu.po b/components/editortoolbar/languages/editortoolbar_str.hu.po
index 68dfa60f14..1a8a386e2c 100644
--- a/components/editortoolbar/languages/editortoolbar_str.hu.po
+++ b/components/editortoolbar/languages/editortoolbar_str.hu.po
@@ -19,6 +19,10 @@ msgstr "Elválasztó hozzáadása"
 msgid "Add selected item to toolbar"
 msgstr "A kijelölt elem hozzáadása az eszköztárhoz"
 
+#: editortoolbar_str.rsbottom
+msgid "Bottom"
+msgstr ""
+
 #: editortoolbar_str.rscancel
 msgid "Cancel"
 msgstr "Mégsem"
@@ -27,6 +31,10 @@ msgstr "Mégsem"
 msgid "Configure Toolbar"
 msgstr "Eszköztár beállítása"
 
+#: editortoolbar_str.rseditortoolbar
+msgid "Editor ToolBar"
+msgstr ""
+
 #: editortoolbar_str.rseditortoolbarconfigform
 msgid "Editor Toolbar Configuration"
 msgstr "Szerkesztő Eszköztár Beállítása"
@@ -35,10 +43,18 @@ msgstr "Szerkesztő Eszköztár Beállítása"
 msgid "Jump To"
 msgstr "Ugrás ide:"
 
+#: editortoolbar_str.rsleft
+msgid "Left"
+msgstr ""
+
 #: editortoolbar_str.rsmenutree
 msgid "Available Menu Items"
 msgstr "Elérhető menüelemek"
 
+#: editortoolbar_str.rsmenuview
+msgid "View"
+msgstr ""
+
 #: editortoolbar_str.rsmoveselecteddown
 msgid "Move selected toolbar item down"
 msgstr "A kijelöl eszköztárelem mozgatása lefelé"
@@ -51,14 +67,38 @@ msgstr "A kijelöl eszköztárelem mozgatása felfelé"
 msgid "OK"
 msgstr "OK"
 
+#: editortoolbar_str.rsposition
+msgid "Position"
+msgstr ""
+
 #: editortoolbar_str.rsremoveselected
 msgid "Remove selected item from toolbar"
 msgstr "A kijelölt elem eltávolítása az eszköztárról"
 
+#: editortoolbar_str.rsright
+msgid "Right"
+msgstr ""
+
+#: editortoolbar_str.rsshowhide
+msgid "Show/Hide Toolbar"
+msgstr ""
+
 #: editortoolbar_str.rstoolbar
 msgid "Toolbar Items"
 msgstr "Eszköztár elemek"
 
+#: editortoolbar_str.rstop
+msgid "Top"
+msgstr ""
+
+#: editortoolbar_str.rsvisible
+msgid "Visible"
+msgstr ""
+
+#: editortoolbar_str.rswarning
+msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via \"%s\" -> \"%s\" main menu"
+msgstr ""
+
 #: editortoolbar_str.serrcouldnotfind
 msgid "Could not find <%s>"
 msgstr "Nem található: <%s>"
diff --git a/components/editortoolbar/languages/editortoolbar_str.it.po b/components/editortoolbar/languages/editortoolbar_str.it.po
index 4468a8e4ff..d34ccdb963 100644
--- a/components/editortoolbar/languages/editortoolbar_str.it.po
+++ b/components/editortoolbar/languages/editortoolbar_str.it.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2011-04-18 11:18+0200\n"
-"Last-Translator: Massimo Soricetti <notturno@quipo.it>\n"
+"PO-Revision-Date: 2014-07-17 19:57+0100\n"
+"Last-Translator: Giuliano Colla <giuliano.colla@fastwebnet.it>\n"
 "Language-Team: PincoPallo Team\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -9,6 +9,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.5.1\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
 
 #: editortoolbar_str.rsadddivider
 msgid "Add Divider"
@@ -16,7 +18,11 @@ msgstr "Aggiungi divisore"
 
 #: editortoolbar_str.rsaddselected
 msgid "Add selected item to toolbar"
-msgstr ""
+msgstr "Aggiungere alla barra degli strumenti"
+
+#: editortoolbar_str.rsbottom
+msgid "Bottom"
+msgstr "Basso"
 
 #: editortoolbar_str.rscancel
 msgid "Cancel"
@@ -26,6 +32,10 @@ msgstr "Annulla"
 msgid "Configure Toolbar"
 msgstr "Configura la toolbar"
 
+#: editortoolbar_str.rseditortoolbar
+msgid "Editor ToolBar"
+msgstr "Barra strumenti dell'editor"
+
 #: editortoolbar_str.rseditortoolbarconfigform
 msgid "Editor Toolbar Configuration"
 msgstr "Editor di configurazione toolbar"
@@ -34,33 +44,64 @@ msgstr "Editor di configurazione toolbar"
 msgid "Jump To"
 msgstr "Salta a"
 
+#: editortoolbar_str.rsleft
+msgid "Left"
+msgstr "Sinistra"
+
 #: editortoolbar_str.rsmenutree
-#, fuzzy
 #| msgid "Menu Tree"
 msgid "Available Menu Items"
-msgstr "Albero dei menu"
+msgstr "Voci disponibili"
+
+#: editortoolbar_str.rsmenuview
+msgid "View"
+msgstr "Visualizza"
 
 #: editortoolbar_str.rsmoveselecteddown
 msgid "Move selected toolbar item down"
-msgstr ""
+msgstr "Spostare in basso"
 
 #: editortoolbar_str.rsmoveselectedup
 msgid "Move selected toolbar item up"
-msgstr ""
+msgstr "Spostare in alto"
 
 #: editortoolbar_str.rsok
 msgid "OK"
 msgstr "OK"
 
+#: editortoolbar_str.rsposition
+msgid "Position"
+msgstr "Posizione"
+
 #: editortoolbar_str.rsremoveselected
 msgid "Remove selected item from toolbar"
-msgstr ""
+msgstr "Rimuovere dalla barra degli strumenti"
+
+#: editortoolbar_str.rsright
+msgid "Right"
+msgstr "Destra"
+
+#: editortoolbar_str.rsshowhide
+msgid "Show/Hide Toolbar"
+msgstr "Mostra/nascondi la barra"
 
 #: editortoolbar_str.rstoolbar
-#, fuzzy
 #| msgid "Toolbar"
 msgid "Toolbar Items"
-msgstr "Toolbar"
+msgstr "Contenuto della barra"
+
+#: editortoolbar_str.rstop
+msgid "Top"
+msgstr "Alto"
+
+#: editortoolbar_str.rsvisible
+msgid "Visible"
+msgstr "Visibile"
+
+#: editortoolbar_str.rswarning
+#| msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via %s -> %s main menu"
+msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via \"%s\" -> \"%s\" main menu"
+msgstr "Avete deciso di nascondere la barra strumenti. Potrete accedere alla configurazione della barra da \"%s\" -> \"%s\" nel menu principale"
 
 #: editortoolbar_str.serrcouldnotfind
 msgid "Could not find <%s>"
diff --git a/components/editortoolbar/languages/editortoolbar_str.lt.po b/components/editortoolbar/languages/editortoolbar_str.lt.po
index 7ca2a4352f..d5e542dded 100644
--- a/components/editortoolbar/languages/editortoolbar_str.lt.po
+++ b/components/editortoolbar/languages/editortoolbar_str.lt.po
@@ -19,6 +19,10 @@ msgstr "Pridėti skyriklį"
 msgid "Add selected item to toolbar"
 msgstr "Pažymėtą elementą įdėti į įrankių juostą"
 
+#: editortoolbar_str.rsbottom
+msgid "Bottom"
+msgstr ""
+
 #: editortoolbar_str.rscancel
 msgid "Cancel"
 msgstr "Atsisakyti"
@@ -27,6 +31,10 @@ msgstr "Atsisakyti"
 msgid "Configure Toolbar"
 msgstr "Derinti įrankių juostą"
 
+#: editortoolbar_str.rseditortoolbar
+msgid "Editor ToolBar"
+msgstr ""
+
 #: editortoolbar_str.rseditortoolbarconfigform
 msgid "Editor Toolbar Configuration"
 msgstr "Rengyklės įrankių juostos sąranka"
@@ -35,10 +43,18 @@ msgstr "Rengyklės įrankių juostos sąranka"
 msgid "Jump To"
 msgstr "Šokti į"
 
+#: editortoolbar_str.rsleft
+msgid "Left"
+msgstr ""
+
 #: editortoolbar_str.rsmenutree
 msgid "Available Menu Items"
 msgstr "Esami meniu elementai"
 
+#: editortoolbar_str.rsmenuview
+msgid "View"
+msgstr ""
+
 #: editortoolbar_str.rsmoveselecteddown
 msgid "Move selected toolbar item down"
 msgstr "Pažymėtą įrankių juostos elementą perkelti žemyn"
@@ -51,14 +67,38 @@ msgstr "Pažymėtą įrankių juostos elementą perkelti aukštyn"
 msgid "OK"
 msgstr "Tinka"
 
+#: editortoolbar_str.rsposition
+msgid "Position"
+msgstr ""
+
 #: editortoolbar_str.rsremoveselected
 msgid "Remove selected item from toolbar"
 msgstr "Iš įrankių juostos pašalinti pažymėtą elementą"
 
+#: editortoolbar_str.rsright
+msgid "Right"
+msgstr ""
+
+#: editortoolbar_str.rsshowhide
+msgid "Show/Hide Toolbar"
+msgstr ""
+
 #: editortoolbar_str.rstoolbar
 msgid "Toolbar Items"
 msgstr "Įrankių juostos elementai"
 
+#: editortoolbar_str.rstop
+msgid "Top"
+msgstr ""
+
+#: editortoolbar_str.rsvisible
+msgid "Visible"
+msgstr ""
+
+#: editortoolbar_str.rswarning
+msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via \"%s\" -> \"%s\" main menu"
+msgstr ""
+
 #: editortoolbar_str.serrcouldnotfind
 msgid "Could not find <%s>"
 msgstr "Nepavyko rasti <%s>"
diff --git a/components/editortoolbar/languages/editortoolbar_str.po b/components/editortoolbar/languages/editortoolbar_str.po
index 29ac1a3861..65af5d50fb 100644
--- a/components/editortoolbar/languages/editortoolbar_str.po
+++ b/components/editortoolbar/languages/editortoolbar_str.po
@@ -9,6 +9,10 @@ msgstr ""
 msgid "Add selected item to toolbar"
 msgstr ""
 
+#: editortoolbar_str.rsbottom
+msgid "Bottom"
+msgstr ""
+
 #: editortoolbar_str.rscancel
 msgid "Cancel"
 msgstr ""
@@ -17,6 +21,10 @@ msgstr ""
 msgid "Configure Toolbar"
 msgstr ""
 
+#: editortoolbar_str.rseditortoolbar
+msgid "Editor ToolBar"
+msgstr ""
+
 #: editortoolbar_str.rseditortoolbarconfigform
 msgid "Editor Toolbar Configuration"
 msgstr ""
@@ -25,10 +33,18 @@ msgstr ""
 msgid "Jump To"
 msgstr ""
 
+#: editortoolbar_str.rsleft
+msgid "Left"
+msgstr ""
+
 #: editortoolbar_str.rsmenutree
 msgid "Available Menu Items"
 msgstr ""
 
+#: editortoolbar_str.rsmenuview
+msgid "View"
+msgstr ""
+
 #: editortoolbar_str.rsmoveselecteddown
 msgid "Move selected toolbar item down"
 msgstr ""
@@ -41,14 +57,38 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
+#: editortoolbar_str.rsposition
+msgid "Position"
+msgstr ""
+
 #: editortoolbar_str.rsremoveselected
 msgid "Remove selected item from toolbar"
 msgstr ""
 
+#: editortoolbar_str.rsright
+msgid "Right"
+msgstr ""
+
+#: editortoolbar_str.rsshowhide
+msgid "Show/Hide Toolbar"
+msgstr ""
+
 #: editortoolbar_str.rstoolbar
 msgid "Toolbar Items"
 msgstr ""
 
+#: editortoolbar_str.rstop
+msgid "Top"
+msgstr ""
+
+#: editortoolbar_str.rsvisible
+msgid "Visible"
+msgstr ""
+
+#: editortoolbar_str.rswarning
+msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via \"%s\" -> \"%s\" main menu"
+msgstr ""
+
 #: editortoolbar_str.serrcouldnotfind
 msgid "Could not find <%s>"
 msgstr ""
diff --git a/components/editortoolbar/languages/editortoolbar_str.pt_BR.po b/components/editortoolbar/languages/editortoolbar_str.pt_BR.po
index 07291f5cac..42dd1ca00d 100644
--- a/components/editortoolbar/languages/editortoolbar_str.pt_BR.po
+++ b/components/editortoolbar/languages/editortoolbar_str.pt_BR.po
@@ -17,6 +17,10 @@ msgstr "Adicionar Divisor"
 msgid "Add selected item to toolbar"
 msgstr "Adicionar item selecionado à barra de ferramentas"
 
+#: editortoolbar_str.rsbottom
+msgid "Bottom"
+msgstr ""
+
 #: editortoolbar_str.rscancel
 msgid "Cancel"
 msgstr "Cancelar"
@@ -25,6 +29,10 @@ msgstr "Cancelar"
 msgid "Configure Toolbar"
 msgstr "Configurar barra de ferramentas"
 
+#: editortoolbar_str.rseditortoolbar
+msgid "Editor ToolBar"
+msgstr ""
+
 #: editortoolbar_str.rseditortoolbarconfigform
 msgid "Editor Toolbar Configuration"
 msgstr "Configuração do editor da barra de ferramentas"
@@ -33,11 +41,19 @@ msgstr "Configuração do editor da barra de ferramentas"
 msgid "Jump To"
 msgstr "Saltar para"
 
+#: editortoolbar_str.rsleft
+msgid "Left"
+msgstr ""
+
 #: editortoolbar_str.rsmenutree
 #| msgid "Menu Tree"
 msgid "Available Menu Items"
 msgstr "Itens disponíveis de menu"
 
+#: editortoolbar_str.rsmenuview
+msgid "View"
+msgstr ""
+
 #: editortoolbar_str.rsmoveselecteddown
 msgid "Move selected toolbar item down"
 msgstr "Mover item selecionado da barra de ferramentas abaixo"
@@ -50,15 +66,39 @@ msgstr "Mover item selecionado da barra de ferramentas acima"
 msgid "OK"
 msgstr "OK"
 
+#: editortoolbar_str.rsposition
+msgid "Position"
+msgstr ""
+
 #: editortoolbar_str.rsremoveselected
 msgid "Remove selected item from toolbar"
 msgstr "Excluir item selecionado da barra de ferramentas"
 
+#: editortoolbar_str.rsright
+msgid "Right"
+msgstr ""
+
+#: editortoolbar_str.rsshowhide
+msgid "Show/Hide Toolbar"
+msgstr ""
+
 #: editortoolbar_str.rstoolbar
 #| msgid "Toolbar"
 msgid "Toolbar Items"
 msgstr "Itens da barra ferramentas"
 
+#: editortoolbar_str.rstop
+msgid "Top"
+msgstr ""
+
+#: editortoolbar_str.rsvisible
+msgid "Visible"
+msgstr ""
+
+#: editortoolbar_str.rswarning
+msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via \"%s\" -> \"%s\" main menu"
+msgstr ""
+
 #: editortoolbar_str.serrcouldnotfind
 msgid "Could not find <%s>"
 msgstr "Impossível localizar <%s>"
diff --git a/components/editortoolbar/languages/editortoolbar_str.ru.po b/components/editortoolbar/languages/editortoolbar_str.ru.po
index de62f123b6..4e80714902 100644
--- a/components/editortoolbar/languages/editortoolbar_str.ru.po
+++ b/components/editortoolbar/languages/editortoolbar_str.ru.po
@@ -17,6 +17,10 @@ msgstr "Добавить разделитель"
 msgid "Add selected item to toolbar"
 msgstr "Добавить выбранный элемент на панель"
 
+#: editortoolbar_str.rsbottom
+msgid "Bottom"
+msgstr ""
+
 #: editortoolbar_str.rscancel
 msgid "Cancel"
 msgstr "Отмена"
@@ -25,6 +29,10 @@ msgstr "Отмена"
 msgid "Configure Toolbar"
 msgstr "Настроить инструментальную панель"
 
+#: editortoolbar_str.rseditortoolbar
+msgid "Editor ToolBar"
+msgstr ""
+
 #: editortoolbar_str.rseditortoolbarconfigform
 msgid "Editor Toolbar Configuration"
 msgstr "Настройка инструментальной панели редактора"
@@ -33,11 +41,19 @@ msgstr "Настройка инструментальной панели ред
 msgid "Jump To"
 msgstr "Перейти к ..."
 
+#: editortoolbar_str.rsleft
+msgid "Left"
+msgstr ""
+
 #: editortoolbar_str.rsmenutree
 #| msgid "Menu Tree"
 msgid "Available Menu Items"
 msgstr "Доступные элементы меню"
 
+#: editortoolbar_str.rsmenuview
+msgid "View"
+msgstr ""
+
 #: editortoolbar_str.rsmoveselecteddown
 msgid "Move selected toolbar item down"
 msgstr "Переместить выбранный элемент вниз"
@@ -50,15 +66,39 @@ msgstr "Переместить выбранный элемент вверх"
 msgid "OK"
 msgstr "ОК"
 
+#: editortoolbar_str.rsposition
+msgid "Position"
+msgstr ""
+
 #: editortoolbar_str.rsremoveselected
 msgid "Remove selected item from toolbar"
 msgstr "Удалить выбранный элемент с панели"
 
+#: editortoolbar_str.rsright
+msgid "Right"
+msgstr ""
+
+#: editortoolbar_str.rsshowhide
+msgid "Show/Hide Toolbar"
+msgstr ""
+
 #: editortoolbar_str.rstoolbar
 #| msgid "Toolbar"
 msgid "Toolbar Items"
 msgstr "Элементы панели"
 
+#: editortoolbar_str.rstop
+msgid "Top"
+msgstr ""
+
+#: editortoolbar_str.rsvisible
+msgid "Visible"
+msgstr ""
+
+#: editortoolbar_str.rswarning
+msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via \"%s\" -> \"%s\" main menu"
+msgstr ""
+
 #: editortoolbar_str.serrcouldnotfind
 msgid "Could not find <%s>"
 msgstr "Невозможно найти <%s>"
diff --git a/components/editortoolbar/languages/editortoolbar_str.uk.po b/components/editortoolbar/languages/editortoolbar_str.uk.po
index b287814cb7..c81c2e575d 100644
--- a/components/editortoolbar/languages/editortoolbar_str.uk.po
+++ b/components/editortoolbar/languages/editortoolbar_str.uk.po
@@ -17,6 +17,10 @@ msgstr "Додати Роздільник"
 msgid "Add selected item to toolbar"
 msgstr ""
 
+#: editortoolbar_str.rsbottom
+msgid "Bottom"
+msgstr ""
+
 #: editortoolbar_str.rscancel
 msgid "Cancel"
 msgstr "Скасувати"
@@ -25,6 +29,10 @@ msgstr "Скасувати"
 msgid "Configure Toolbar"
 msgstr "Налаштувати Панель Інструментів"
 
+#: editortoolbar_str.rseditortoolbar
+msgid "Editor ToolBar"
+msgstr ""
+
 #: editortoolbar_str.rseditortoolbarconfigform
 msgid "Editor Toolbar Configuration"
 msgstr "Налаштування Панелі Інструментів Редактора"
@@ -33,12 +41,20 @@ msgstr "Налаштування Панелі Інструментів Реда
 msgid "Jump To"
 msgstr "Перейти До"
 
+#: editortoolbar_str.rsleft
+msgid "Left"
+msgstr ""
+
 #: editortoolbar_str.rsmenutree
 #, fuzzy
 #| msgid "Menu Tree"
 msgid "Available Menu Items"
 msgstr "Дерево Меню"
 
+#: editortoolbar_str.rsmenuview
+msgid "View"
+msgstr ""
+
 #: editortoolbar_str.rsmoveselecteddown
 msgid "Move selected toolbar item down"
 msgstr ""
@@ -51,16 +67,40 @@ msgstr ""
 msgid "OK"
 msgstr "Гаразд"
 
+#: editortoolbar_str.rsposition
+msgid "Position"
+msgstr ""
+
 #: editortoolbar_str.rsremoveselected
 msgid "Remove selected item from toolbar"
 msgstr ""
 
+#: editortoolbar_str.rsright
+msgid "Right"
+msgstr ""
+
+#: editortoolbar_str.rsshowhide
+msgid "Show/Hide Toolbar"
+msgstr ""
+
 #: editortoolbar_str.rstoolbar
 #, fuzzy
 #| msgid "Toolbar"
 msgid "Toolbar Items"
 msgstr "Панель Інструментів"
 
+#: editortoolbar_str.rstop
+msgid "Top"
+msgstr ""
+
+#: editortoolbar_str.rsvisible
+msgid "Visible"
+msgstr ""
+
+#: editortoolbar_str.rswarning
+msgid "You've chosen to hide the toolbar. You may access the toolbar configuration via \"%s\" -> \"%s\" main menu"
+msgstr ""
+
 #: editortoolbar_str.serrcouldnotfind
 msgid "Could not find <%s>"
 msgstr "Неможливо знайти <%s>"