diff --git a/.gitattributes b/.gitattributes
index f4babf58c7..dc7f42870d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -707,8 +707,8 @@ components/editortoolbar/editortoolbar.lpk svneol=native#text/plain
 components/editortoolbar/editortoolbar.lrs svneol=native#text/pascal
 components/editortoolbar/editortoolbar.pas svneol=native#text/plain
 components/editortoolbar/editortoolbar_impl.pas svneol=native#text/plain
+components/editortoolbar/editortoolbar_str.pas svneol=native#text/pascal
 components/editortoolbar/edttbconfigfrm.lfm svneol=native#text/plain
-components/editortoolbar/edttbconfigfrm.lrs svneol=native#text/pascal
 components/editortoolbar/edttbconfigfrm.pas svneol=native#text/plain
 components/editortoolbar/execute.lrs svneol=native#text/pascal
 components/editortoolbar/images/README.txt svneol=native#text/plain
@@ -721,6 +721,9 @@ components/editortoolbar/images/jumpto16.xpm -text svneol=unset#image/x-xpixmap
 components/editortoolbar/images/preferences16.xpm -text svneol=unset#image/x-xpixmap
 components/editortoolbar/jumpto.pas svneol=native#text/plain
 components/editortoolbar/jumpto_impl.pas svneol=native#text/plain
+components/editortoolbar/languages/editortoolbar_str.pb.po svneol=native#text/plain
+components/editortoolbar/languages/editortoolbar_str.po svneol=native#text/plain
+components/editortoolbar/languages/editortoolbar_str.ru.po svneol=native#text/plain
 components/editortoolbar/toolbar.lrs svneol=native#text/pascal
 components/education/README.txt svneol=native#text/plain
 components/education/educationlaz.lpk svneol=native#text/plain
diff --git a/components/editortoolbar/editortoolbar.lpk b/components/editortoolbar/editortoolbar.lpk
index 44bbf9180e..85cad21a1f 100644
--- a/components/editortoolbar/editortoolbar.lpk
+++ b/components/editortoolbar/editortoolbar.lpk
@@ -1,16 +1,13 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="2">
+  <Package Version="3">
     <Name Value="editortoolbar"/>
     <Author Value="Graeme Geldenhuys"/>
     <CompilerOptions>
-      <Version Value="5"/>
+      <Version Value="8"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
-      <CodeGeneration>
-        <Generate Value="Faster"/>
-      </CodeGeneration>
       <Other>
         <CompilerPath Value="$(CompPath)"/>
       </Other>
@@ -20,7 +17,7 @@
     <License Value="GPL
 "/>
     <Version Minor="4"/>
-    <Files Count="3">
+    <Files Count="4">
       <Item1>
         <Filename Value="jumpto_impl.pas"/>
         <UnitName Value="jumpto_impl"/>
@@ -34,7 +31,15 @@
         <Filename Value="edttbconfigfrm.pas"/>
         <UnitName Value="EdtTbConfigFrm"/>
       </Item3>
+      <Item4>
+        <Filename Value="editortoolbar_str.pas"/>
+        <UnitName Value="editortoolbar_str"/>
+      </Item4>
     </Files>
+    <i18n>
+      <EnableI18N Value="True"/>
+      <OutDir Value="languages"/>
+    </i18n>
     <Type Value="DesignTime"/>
     <RequiredPkgs Count="4">
       <Item1>
diff --git a/components/editortoolbar/editortoolbar.pas b/components/editortoolbar/editortoolbar.pas
index d4729c39f0..a7aaff0845 100644
--- a/components/editortoolbar/editortoolbar.pas
+++ b/components/editortoolbar/editortoolbar.pas
@@ -1,21 +1,22 @@
-{ This file was automatically created by Lazarus. Do not edit!
-This source is only used to compile and install the package.
+{ Этот файл был автоматически создан Lazarus. Не редактировать!
+  Исходный код используется только для компиляции и установки пакета.
  }
 
-unit editortoolbar; 
+unit editortoolbar;
 
 interface
 
 uses
-  jumpto_impl, editortoolbar_impl, EdtTbConfigFrm, LazarusPackageIntf; 
+    jumpto_impl, editortoolbar_impl, EdtTbConfigFrm, editortoolbar_str, 
+  LazarusPackageIntf;
 
 implementation
 
-procedure Register; 
+procedure Register;
 begin
-  RegisterUnit('editortoolbar_impl', @editortoolbar_impl.Register); 
-end; 
+  RegisterUnit('editortoolbar_impl',@editortoolbar_impl.Register);
+end;
 
 initialization
-  RegisterPackage('editortoolbar', @Register); 
+  RegisterPackage('editortoolbar',@Register);
 end.
diff --git a/components/editortoolbar/editortoolbar_impl.pas b/components/editortoolbar/editortoolbar_impl.pas
index f72d0b5cf6..1cdf800f77 100644
--- a/components/editortoolbar/editortoolbar_impl.pas
+++ b/components/editortoolbar/editortoolbar_impl.pas
@@ -34,6 +34,7 @@ uses
   ,MenuIntf
   ,IDEImagesIntf
   ,SrcEditorIntf
+  ,editortoolbar_str
   ;
 
 
@@ -299,7 +300,7 @@ begin
     // Config Button
     if CfgButton = nil then
       CfgButton := TToolbutton.Create(TB);
-    CfgButton.Caption     := 'Configure Toolbar';
+    CfgButton.Caption     := rsConfigureToo;
     CfgButton.Hint        := CfgButton.Caption;
     CfgButton.ImageIndex  := IDEImages.LoadImage(16, 'preferences16');
     CfgButton.Style       := tbsButton;
@@ -310,7 +311,7 @@ begin
     
     // JumpTo Button
     B := TToolbutton.Create(TB);
-    B.Caption       := 'Jump To';
+    B.Caption       := rsJumpTo;
     B.Hint          := B.Caption;
     B.ImageIndex    := IDEImages.LoadImage(16, 'jumpto16');
     B.Style         := tbsDropDown;
diff --git a/components/editortoolbar/editortoolbar_str.pas b/components/editortoolbar/editortoolbar_str.pas
new file mode 100644
index 0000000000..69a9ddc9ec
--- /dev/null
+++ b/components/editortoolbar/editortoolbar_str.pas
@@ -0,0 +1,24 @@
+unit editortoolbar_str;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils; 
+
+resourcestring
+  SErrCouldNotFind = 'Could not find <%s>';
+  rsConfigureToo = 'Configure Toolbar';
+  rsJumpTo = 'Jump To';
+  rsEditorToolbarConfigForm = 'Editor Toolbar Configuration';
+  rsOK                      = 'OK';
+  rsCancel                  = 'Cancel';
+  rsToolbar                 = 'Toolbar';
+  rsMenuTree                = 'Menu Tree';
+  rsAddDivider              = 'Add Divider';
+
+implementation
+
+end.
+
diff --git a/components/editortoolbar/edttbconfigfrm.lrs b/components/editortoolbar/edttbconfigfrm.lrs
deleted file mode 100644
index d42efac873..0000000000
--- a/components/editortoolbar/edttbconfigfrm.lrs
+++ /dev/null
@@ -1,51 +0,0 @@
-{ This is an automatically generated lazarus resource file }
-
-LazarusResources.Add('TEdtTbConfigForm','FORMDATA',[
-  'TPF0'#16'TEdtTbConfigForm'#15'EdtTbConfigForm'#4'Left'#3'w'#1#6'Height'#3'J'
-  +#1#3'Top'#3#200#0#5'Width'#3#139#2#13'ActiveControl'#7#5'btnOK'#7'Caption'#6
-  +#15'EdtTbConfigForm'#12'ClientHeight'#3'J'#1#11'ClientWidth'#3#139#2#8'OnCre'
-  +'ate'#7#10'FormCreate'#10'LCLVersion'#6#6'0.9.27'#0#6'TLabel'#11'lblMenuTree'
-  +#4'Left'#2#16#6'Height'#2#18#3'Top'#2#10#5'Width'#2'L'#7'Caption'#6#11'lblMe'
-  +'nuTree'#11'ParentColor'#8#0#0#6'TLabel'#10'lblToolbar'#4'Left'#3#200#1#6'He'
-  +'ight'#2#18#3'Top'#2#10#5'Width'#2'<'#7'Caption'#6#10'lblToolbar'#11'ParentC'
-  +'olor'#8#0#0#12'TSpeedButton'#9'btnRemove'#4'Left'#3#176#1#6'Height'#2#26#3
-  +'Top'#2'J'#5'Width'#2#22#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'
-  +#7#14'btnRemoveClick'#0#0#12'TSpeedButton'#6'btnAdd'#4'Left'#3#176#1#6'Heigh'
-  +'t'#2#26#3'Top'#2'c'#5'Width'#2#22#5'Color'#7#9'clBtnFace'#9'NumGlyphs'#2#0#7
-  +'OnClick'#7#11'btnAddClick'#0#0#12'TSpeedButton'#9'btnMoveUp'#4'Left'#3#176#1
-  +#6'Height'#2#26#3'Top'#3#157#0#5'Width'#2#22#5'Color'#7#9'clBtnFace'#9'NumGl'
-  +'yphs'#2#0#7'OnClick'#7#14'btnMoveUpClick'#0#0#12'TSpeedButton'#11'btnMoveDo'
-  +'wn'#4'Left'#3#176#1#6'Height'#2#26#3'Top'#3#182#0#5'Width'#2#22#5'Color'#7#9
-  +'clBtnFace'#9'NumGlyphs'#2#0#7'OnClick'#7#16'btnMoveDownClick'#0#0#6'TPanel'
-  +#10'pnlButtons'#4'Left'#2#0#6'Height'#2'*'#3'Top'#3' '#1#5'Width'#3#139#2#5
-  +'Align'#7#8'alBottom'#10'BevelOuter'#7#6'bvNone'#12'ClientHeight'#2'*'#11'Cl'
-  +'ientWidth'#3#139#2#5'Color'#7#7'clGreen'#11'ParentColor'#8#8'TabOrder'#2#0#0
-  +#6'TBevel'#6'Bevel1'#4'Left'#2#0#6'Height'#2#2#3'Top'#2#0#5'Width'#3#139#2#5
-  +'Align'#7#5'alTop'#0#0#7'TButton'#5'btnOK'#23'AnchorSideRight.Control'#7#9'b'
-  +'tnCancel'#24'AnchorSideBottom.Control'#7#10'pnlButtons'#21'AnchorSideBottom'
-  +'.Side'#7#9'asrBottom'#4'Left'#3#224#1#6'Height'#2#25#3'Top'#2#11#5'Width'#2
-  +'K'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Ri'
-  +'ght'#2#6#20'BorderSpacing.Bottom'#2#6#25'BorderSpacing.InnerBorder'#2#4#7'C'
-  +'aption'#6#5'btnOK'#21'Constraints.MaxHeight'#2#25#21'Constraints.MinHeight'
-  +#2#25#20'Constraints.MinWidth'#2'K'#11'ModalResult'#2#1#7'OnClick'#7#10'btnO'
-  +'KClick'#8'TabOrder'#2#0#0#0#7'TButton'#9'btnCancel'#23'AnchorSideRight.Cont'
-  +'rol'#7#10'pnlButtons'#20'AnchorSideRight.Side'#7#9'asrBottom'#24'AnchorSide'
-  +'Bottom.Control'#7#10'pnlButtons'#21'AnchorSideBottom.Side'#7#9'asrBottom'#4
-  +'Left'#3'1'#2#6'Height'#2#25#3'Top'#2#11#5'Width'#2'T'#7'Anchors'#11#7'akRig'
-  +'ht'#8'akBottom'#0#8'AutoSize'#9#19'BorderSpacing.Right'#2#6#20'BorderSpacin'
-  +'g.Bottom'#2#6#25'BorderSpacing.InnerBorder'#2#4#6'Cancel'#9#7'Caption'#6#9
-  +'btnCancel'#21'Constraints.MaxHeight'#2#25#21'Constraints.MinHeight'#2#25#20
-  +'Constraints.MinWidth'#2'K'#11'ModalResult'#2#2#8'TabOrder'#2#1#0#0#0#7'TBut'
-  +'ton'#13'btnAddDivider'#4'Left'#3#241#1#6'Height'#2#25#3'Top'#3#0#1#5'Width'
-  +#2'n'#7'Anchors'#11#7'akRight'#8'akBottom'#0#8'AutoSize'#9#25'BorderSpacing.'
-  +'InnerBorder'#2#4#7'Caption'#6#13'btnAddDivider'#21'Constraints.MaxHeight'#2
-  +#25#21'Constraints.MinHeight'#2#25#20'Constraints.MinWidth'#2'K'#7'OnClick'#7
-  +#18'btnAddDividerClick'#8'TabOrder'#2#1#0#0#8'TListBox'#9'lbToolbar'#4'Left'
-  +#3#200#1#6'Height'#3#225#0#3'Top'#2#28#5'Width'#3#183#0#10'ItemHeight'#2#0#8
-  +'TabOrder'#2#2#8'TopIndex'#2#255#0#0#9'TTreeView'#2'TV'#4'Left'#2#16#6'Heigh'
-  +'t'#3#253#0#3'Top'#2#28#5'Width'#3#136#1#17'DefaultItemHeight'#2#19#8'ReadOn'
-  +'ly'#9#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#3#8'OnChange'#7#8'TVCha'
-  +'nge'#7'Options'#11#17'tvoAutoItemHeight'#16'tvoHideSelection'#21'tvoKeepCol'
-  +'lapsedNodes'#11'tvoReadOnly'#14'tvoShowButtons'#12'tvoShowLines'#11'tvoShow'
-  +'Root'#11'tvoToolTips'#0#0#0#0
-]);
diff --git a/components/editortoolbar/edttbconfigfrm.pas b/components/editortoolbar/edttbconfigfrm.pas
index 3f7c80b34d..771f102184 100644
--- a/components/editortoolbar/edttbconfigfrm.pas
+++ b/components/editortoolbar/edttbconfigfrm.pas
@@ -24,7 +24,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  Buttons, StdCtrls, ComCtrls, MenuIntf;
+  Buttons, StdCtrls, ComCtrls, MenuIntf, editortoolbar_str;
 
 type
   TEdtTbConfigForm = class(TForm)
@@ -62,6 +62,8 @@ type
 
 implementation
 
+{$R *.lfm}
+
 uses
   editortoolbar_impl
   ,LazConfigStorage
@@ -70,16 +72,6 @@ uses
   ,IDEImagesIntf
   ;
 
-
-resourcestring
-  rsEditorToolbarConfigForm = 'Editor Toolbar Configuration';
-  rsOK                      = 'OK';
-  rsCancel                  = 'Cancel';
-  rsToolbar                 = 'Toolbar';
-  rsMenuTree                = 'Menu Tree';
-  rsAddDivider              = 'Add Divider';
-
-
 { TEdtTbConfigForm }
 
 procedure TEdtTbConfigForm.FormCreate(Sender: TObject);
@@ -267,8 +259,5 @@ begin
   end;
 end;
 
-initialization
-  {$I edttbconfigfrm.lrs}
-
 end.
 
diff --git a/components/editortoolbar/jumpto_impl.pas b/components/editortoolbar/jumpto_impl.pas
index dcb1085c35..6dbff335a3 100644
--- a/components/editortoolbar/jumpto_impl.pas
+++ b/components/editortoolbar/jumpto_impl.pas
@@ -35,8 +35,6 @@ type
 
 
 const
-  SErrCouldNotFind = 'Could not find <%s>';
-
   cJumpNames: array[TJumpType] of string =
       ('Interface', 'Interface uses', 'Implementation', 'Implementation uses',
        'Initialization');
@@ -67,9 +65,8 @@ uses
   ,Forms
   ,ComCtrls
   ,Menus
+  ,editortoolbar_str
   ;
-  
-
 
 { TJumpHandler }
 
diff --git a/components/editortoolbar/languages/editortoolbar_str.pb.po b/components/editortoolbar/languages/editortoolbar_str.pb.po
new file mode 100644
index 0000000000..edf36fff17
--- /dev/null
+++ b/components/editortoolbar/languages/editortoolbar_str.pb.po
@@ -0,0 +1,47 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Marcelo Borges de Paula\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: editortoolbar_str.rsadddivider
+msgid "Add Divider"
+msgstr "Adicionar Divisor"
+
+#: editortoolbar_str.rscancel
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: editortoolbar_str.rsconfiguretoo
+msgid "Configure Toolbar"
+msgstr "Configurar Barra Ferramentas"
+
+#: editortoolbar_str.rseditortoolbarconfigform
+msgid "Editor Toolbar Configuration"
+msgstr "Configuração do Editor da Barra de Tarefas"
+
+#: editortoolbar_str.rsjumpto
+msgid "Jump To"
+msgstr "Saltar para"
+
+#: editortoolbar_str.rsmenutree
+msgid "Menu Tree"
+msgstr "Árvore Menu"
+
+#: editortoolbar_str.rsok
+msgid "OK"
+msgstr "OK"
+
+#: editortoolbar_str.rstoolbar
+msgid "Toolbar"
+msgstr "Barra Ferramentas"
+
+#: editortoolbar_str.serrcouldnotfind
+msgid "Could not find <%s>"
+msgstr "Impossível localizar <%s>"
+
diff --git a/components/editortoolbar/languages/editortoolbar_str.po b/components/editortoolbar/languages/editortoolbar_str.po
new file mode 100644
index 0000000000..698f88c601
--- /dev/null
+++ b/components/editortoolbar/languages/editortoolbar_str.po
@@ -0,0 +1,39 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: editortoolbar_str.rsadddivider
+msgid "Add Divider"
+msgstr ""
+
+#: editortoolbar_str.rscancel
+msgid "Cancel"
+msgstr ""
+
+#: editortoolbar_str.rsconfiguretoo
+msgid "Configure Toolbar"
+msgstr ""
+
+#: editortoolbar_str.rseditortoolbarconfigform
+msgid "Editor Toolbar Configuration"
+msgstr ""
+
+#: editortoolbar_str.rsjumpto
+msgid "Jump To"
+msgstr ""
+
+#: editortoolbar_str.rsmenutree
+msgid "Menu Tree"
+msgstr ""
+
+#: editortoolbar_str.rsok
+msgid "OK"
+msgstr ""
+
+#: editortoolbar_str.rstoolbar
+msgid "Toolbar"
+msgstr ""
+
+#: editortoolbar_str.serrcouldnotfind
+msgid "Could not find <%s>"
+msgstr ""
+
diff --git a/components/editortoolbar/languages/editortoolbar_str.ru.po b/components/editortoolbar/languages/editortoolbar_str.ru.po
new file mode 100644
index 0000000000..5f77b131be
--- /dev/null
+++ b/components/editortoolbar/languages/editortoolbar_str.ru.po
@@ -0,0 +1,47 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Last-Translator: Maxim Ganetsky <maxkill@mail.ru>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: editortoolbar_str.rsadddivider
+msgid "Add Divider"
+msgstr "Добавить разделитель"
+
+#: editortoolbar_str.rscancel
+msgid "Cancel"
+msgstr "Отмена"
+
+#: editortoolbar_str.rsconfiguretoo
+msgid "Configure Toolbar"
+msgstr "Настроить инструментальную панель"
+
+#: editortoolbar_str.rseditortoolbarconfigform
+msgid "Editor Toolbar Configuration"
+msgstr "Настройка инструментальной панели редактора"
+
+#: editortoolbar_str.rsjumpto
+msgid "Jump To"
+msgstr "Перейти к ..."
+
+#: editortoolbar_str.rsmenutree
+msgid "Menu Tree"
+msgstr "Дерево меню"
+
+#: editortoolbar_str.rsok
+msgid "OK"
+msgstr "ОК"
+
+#: editortoolbar_str.rstoolbar
+msgid "Toolbar"
+msgstr "Инструментальная панель"
+
+#: editortoolbar_str.serrcouldnotfind
+msgid "Could not find <%s>"
+msgstr "Невозможно найти <%s>"
+