diff --git a/.gitattributes b/.gitattributes
index 1b34a658fc..ac5a204e8f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -924,6 +924,15 @@ components/fpweb/demo/session/wmsession.lrs svneol=native#text/pascal
 components/fpweb/demo/session/wmsession.pp svneol=native#text/plain
 components/fpweb/frmrpcmoduleoptions.lfm svneol=native#text/plain
 components/fpweb/frmrpcmoduleoptions.pp svneol=native#text/plain
+components/fpweb/languages/frmrpcmoduleoptions.pb.po svneol=native#text/plain
+components/fpweb/languages/frmrpcmoduleoptions.po svneol=native#text/plain
+components/fpweb/languages/frmrpcmoduleoptions.ru.po svneol=native#text/plain
+components/fpweb/languages/reglazwebextra.pb.po svneol=native#text/plain
+components/fpweb/languages/reglazwebextra.po svneol=native#text/plain
+components/fpweb/languages/reglazwebextra.ru.po svneol=native#text/plain
+components/fpweb/languages/weblazideintf.pb.po svneol=native#text/plain
+components/fpweb/languages/weblazideintf.po svneol=native#text/plain
+components/fpweb/languages/weblazideintf.ru.po svneol=native#text/plain
 components/fpweb/lazweb.pp svneol=native#text/plain
 components/fpweb/lazwebextra.lpk svneol=native#text/plain
 components/fpweb/reglazwebextra.pp svneol=native#text/plain
diff --git a/components/fpweb/frmrpcmoduleoptions.pp b/components/fpweb/frmrpcmoduleoptions.pp
index ceff0a735b..2ca9524871 100644
--- a/components/fpweb/frmrpcmoduleoptions.pp
+++ b/components/fpweb/frmrpcmoduleoptions.pp
@@ -22,6 +22,7 @@ type
     Label2: TLabel;
     procedure CBRegisterHandlersChange(Sender: TObject);
     procedure CBRegisterModuleChange(Sender: TObject);
+    procedure FormCreate(Sender: TObject);
   private
     function GetHP: String;
     function GetJC: String;
@@ -43,6 +44,13 @@ var
 
 implementation
 
+resourcestring
+  sCaption = 'Create a new JSON-RPC module';
+  sRegisterJSON = 'Register JSON-RPC handlers in factory';
+  sJSONClass = 'JSON-RPC class';
+  sRegisterWebM = 'Register web module';
+  sHTTPPath = 'HTTP Path';
+
 {$R *.lfm}
 
 { TJSONRPCModuleOptionsForm }
@@ -57,6 +65,15 @@ begin
    ERegModuleName.Enabled:=CBRegisterModule.Checked;
 end;
 
+procedure TJSONRPCModuleOptionsForm.FormCreate(Sender: TObject);
+begin
+  Caption := sCaption;
+  CBRegisterHandlers.Caption := sRegisterJSON;
+  CBRegisterModule.Caption := sRegisterWebM;
+  Label1.Caption:= sJSONClass;
+  Label2.Caption:= sHTTPPath;
+end;
+
 function TJSONRPCModuleOptionsForm.GetHP: String;
 begin
   Result:=ERegModuleName.Text;
diff --git a/components/fpweb/languages/frmrpcmoduleoptions.pb.po b/components/fpweb/languages/frmrpcmoduleoptions.pb.po
new file mode 100644
index 0000000000..31845d5f5c
--- /dev/null
+++ b/components/fpweb/languages/frmrpcmoduleoptions.pb.po
@@ -0,0 +1,31 @@
+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"
+
+#: frmrpcmoduleoptions.scaption
+msgid "Create a new JSON-RPC module"
+msgstr "Criar um novo módulo JSON-RPC"
+
+#: frmrpcmoduleoptions.shttppath
+msgid "HTTP Path"
+msgstr "Caminho HTTP"
+
+#: frmrpcmoduleoptions.sjsonclass
+msgid "JSON-RPC class"
+msgstr "Classe JSON-RPC"
+
+#: frmrpcmoduleoptions.sregisterjson
+msgid "Register JSON-RPC handlers in factory"
+msgstr "Registrar manipuladores JSON-RPC na fábrica"
+
+#: frmrpcmoduleoptions.sregisterwebm
+msgid "Register web module"
+msgstr "Registrar módulo web"
+
diff --git a/components/fpweb/languages/frmrpcmoduleoptions.po b/components/fpweb/languages/frmrpcmoduleoptions.po
new file mode 100644
index 0000000000..8d7c85b5ca
--- /dev/null
+++ b/components/fpweb/languages/frmrpcmoduleoptions.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: frmrpcmoduleoptions.scaption
+msgid "Create a new JSON-RPC module"
+msgstr ""
+
+#: frmrpcmoduleoptions.shttppath
+msgid "HTTP Path"
+msgstr ""
+
+#: frmrpcmoduleoptions.sjsonclass
+msgid "JSON-RPC class"
+msgstr ""
+
+#: frmrpcmoduleoptions.sregisterjson
+msgid "Register JSON-RPC handlers in factory"
+msgstr ""
+
+#: frmrpcmoduleoptions.sregisterwebm
+msgid "Register web module"
+msgstr ""
+
diff --git a/components/fpweb/languages/frmrpcmoduleoptions.ru.po b/components/fpweb/languages/frmrpcmoduleoptions.ru.po
new file mode 100644
index 0000000000..9a53221fec
--- /dev/null
+++ b/components/fpweb/languages/frmrpcmoduleoptions.ru.po
@@ -0,0 +1,31 @@
+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"
+
+#: frmrpcmoduleoptions.scaption
+msgid "Create a new JSON-RPC module"
+msgstr "Создать новый модуль JSON-RPC"
+
+#: frmrpcmoduleoptions.shttppath
+msgid "HTTP Path"
+msgstr "Путь HTTP"
+
+#: frmrpcmoduleoptions.sjsonclass
+msgid "JSON-RPC class"
+msgstr "Класс JSON-RPC"
+
+#: frmrpcmoduleoptions.sregisterjson
+msgid "Register JSON-RPC handlers in factory"
+msgstr "Зарегистрировать обработчики JSON-RPC в механизме"
+
+#: frmrpcmoduleoptions.sregisterwebm
+msgid "Register web module"
+msgstr "Зарегистрировать веб-модуль"
+
diff --git a/components/fpweb/languages/reglazwebextra.pb.po b/components/fpweb/languages/reglazwebextra.pb.po
new file mode 100644
index 0000000000..4519e9e824
--- /dev/null
+++ b/components/fpweb/languages/reglazwebextra.pb.po
@@ -0,0 +1,35 @@
+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"
+
+#: reglazwebextra.rswebdataprovi
+msgid "Web DataProvider Module"
+msgstr "Módulo Web DataProvider"
+
+#: reglazwebextra.rswebdataprovi2
+msgid "WEB DataProvider Module%sA datamodule to handle data requests for WEB (HTTP) applications using WebDataProvider components."
+msgstr "Módulo Web DataProvider%sUm módulo de dados para lidar com requisições de dados de aplicações Web (HTTP) usando componentes WebDataProvider."
+
+#: reglazwebextra.rswebextdirect
+msgid "Web Ext.Direct Module"
+msgstr "Módulo Web Ext.Direct"
+
+#: reglazwebextra.rswebextdirect2
+msgid "WEB Ext.Direct Module%sA datamodule to dispatch Ext.Direct requests in WEB (HTTP) applications using TJSONRPCHandler components."
+msgstr "Módulo Web Ext.Direct%sUm módulo de dados para despachar requisições Ext.Direct em aplicações Web (HTTP) usando componentes TJSONRPCHandler."
+
+#: reglazwebextra.rswebjsonrpcmo
+msgid "Web JSON-RPC Module"
+msgstr "Módulo Web JSON-RPC"
+
+#: reglazwebextra.rswebjsonrpcmo2
+msgid "WEB JSON-RPC Module%sA datamodule to dispatch JSON-RPC requests in WEB (HTTP) applications using TJSONRPCHandler components."
+msgstr "Módulo Web JSON-RPC%sUm módulo de dados para despachar requisições JSON-RPC em aplicações Web (HTTP) usando componentes TJSONRPCHandler."
+
diff --git a/components/fpweb/languages/reglazwebextra.po b/components/fpweb/languages/reglazwebextra.po
new file mode 100644
index 0000000000..811dac7c3d
--- /dev/null
+++ b/components/fpweb/languages/reglazwebextra.po
@@ -0,0 +1,27 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: reglazwebextra.rswebdataprovi
+msgid "Web DataProvider Module"
+msgstr ""
+
+#: reglazwebextra.rswebdataprovi2
+msgid "WEB DataProvider Module%sA datamodule to handle data requests for WEB (HTTP) applications using WebDataProvider components."
+msgstr ""
+
+#: reglazwebextra.rswebextdirect
+msgid "Web Ext.Direct Module"
+msgstr ""
+
+#: reglazwebextra.rswebextdirect2
+msgid "WEB Ext.Direct Module%sA datamodule to dispatch Ext.Direct requests in WEB (HTTP) applications using TJSONRPCHandler components."
+msgstr ""
+
+#: reglazwebextra.rswebjsonrpcmo
+msgid "Web JSON-RPC Module"
+msgstr ""
+
+#: reglazwebextra.rswebjsonrpcmo2
+msgid "WEB JSON-RPC Module%sA datamodule to dispatch JSON-RPC requests in WEB (HTTP) applications using TJSONRPCHandler components."
+msgstr ""
+
diff --git a/components/fpweb/languages/reglazwebextra.ru.po b/components/fpweb/languages/reglazwebextra.ru.po
new file mode 100644
index 0000000000..441bc37a05
--- /dev/null
+++ b/components/fpweb/languages/reglazwebextra.ru.po
@@ -0,0 +1,35 @@
+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"
+
+#: reglazwebextra.rswebdataprovi
+msgid "Web DataProvider Module"
+msgstr "Модуль Web DataProvider"
+
+#: reglazwebextra.rswebdataprovi2
+msgid "WEB DataProvider Module%sA datamodule to handle data requests for WEB (HTTP) applications using WebDataProvider components."
+msgstr "Модуль Web DataProvider%sМодуль данных для обработки запросов данных в приложениях веб (HTTP) с использованием компонентов WebDataProvider."
+
+#: reglazwebextra.rswebextdirect
+msgid "Web Ext.Direct Module"
+msgstr "Модуль Web Ext.Direct"
+
+#: reglazwebextra.rswebextdirect2
+msgid "WEB Ext.Direct Module%sA datamodule to dispatch Ext.Direct requests in WEB (HTTP) applications using TJSONRPCHandler components."
+msgstr "Модуль Web Ext.Direct%sМодуль данных для обработки запросов Ext.Direct в приложениях веб (HTTP) с использованием компонентов TJSONRPCHandler."
+
+#: reglazwebextra.rswebjsonrpcmo
+msgid "Web JSON-RPC Module"
+msgstr "Модуль Web JSON-RPC"
+
+#: reglazwebextra.rswebjsonrpcmo2
+msgid "WEB JSON-RPC Module%sA datamodule to dispatch JSON-RPC requests in WEB (HTTP) applications using TJSONRPCHandler components."
+msgstr "Модуль Web JSON-RPC%sМодуль данных для обработки запросов JSON-RPC в приложениях веб (HTTP) с использованием компонентов TJSONRPCHandler."
+
diff --git a/components/fpweb/languages/weblazideintf.pb.po b/components/fpweb/languages/weblazideintf.pb.po
new file mode 100644
index 0000000000..ff5e19c778
--- /dev/null
+++ b/components/fpweb/languages/weblazideintf.pb.po
@@ -0,0 +1,67 @@
+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"
+
+#: weblazideintf.rsapachemodule
+msgid "Apache Module"
+msgstr "Módulo Apache"
+
+#: weblazideintf.rsapachemodule2
+msgid "Apache module%sAn Apache loadable module in Free Pascal using webmodules. The main library file is automatically maintained by Lazarus."
+msgstr "Módulo Apache%sUm módulo Apache carregável no Free Pascal usando módulos web. O arquivo biblioteca principal é mantido automaticamente pelo Lazarus."
+
+#: weblazideintf.rscgiapplicati
+msgid "CGI Application"
+msgstr "Aplicação CGI"
+
+#: weblazideintf.rscgiapplicati2
+msgid "CGI Application%sA CGI (Common Gateway Interface) program in Free Pascal using webmodules. The program source is automatically maintained by Lazarus."
+msgstr "Aplicação CGI%sUm programa CGI (Common Gateway Interface) em Free Pascal usando módulos web. O fonte do programa é mantido automaticamente pelo Lazarus."
+
+#: weblazideintf.rscustomcgiapp
+msgid "Custom CGI Application"
+msgstr "Aplicação CGI personalizada"
+
+#: weblazideintf.rscustomcgiapp2
+msgid "Custom CGI Application%sA CGI (Common Gateway Interface) program in Free Pascal. The program source is automatically maintained by Lazarus."
+msgstr "Aplicação CGI personalizada%sUm programa CGI (Common Gateway Interface) em Free Pascal. O fonte do programa é mantido automaticamente pelo Lazarus."
+
+#: weblazideintf.rscustomfastcg
+msgid "Custom FastCGI Application"
+msgstr "Aplicação FastCGI personalizada"
+
+#: weblazideintf.rscustomfastcg2
+msgid "Custom FastCGI Application%sA FastCGI (Common Gateway Interface) program in Free Pascal. The program source is automatically maintained by Lazarus."
+msgstr "Aplicação FastCGI personalizada%sUm programa FastCGI (Common Gateway Interface) em Free Pascal. O fonte do programa é mantido automaticamente pelo Lazarus."
+
+#: weblazideintf.rsfastcgiappli
+msgid "FastCGI Application"
+msgstr "Aplicação FastCGI"
+
+#: weblazideintf.rsfastcgiappli2
+msgid "FastCGI Application%sA FastCGI (Common Gateway Interface) program in Free Pascal using webmodules. The program source is automatically maintained by Lazarus."
+msgstr "Aplicação FastCGI%sUm programa FastCGI (Common Gateway Interface) em Free Pascal usando módulos web. O fonte do programa é mantido automaticamente pelo Lazarus."
+
+#: weblazideintf.rshtmlwebmodul
+msgid "HTML Web Module"
+msgstr "Módulo Web HTML"
+
+#: weblazideintf.rshtmlwebmodul2
+msgid "HTML WEB Module%sA Web datamodule for producing strict HTML."
+msgstr "Módulo Web HTML%sUm módulo de dados Web para geração HTML."
+
+#: weblazideintf.rswebmodule
+msgid "Web Module"
+msgstr "Módulo Web"
+
+#: weblazideintf.rswebmoduleada
+msgid "WEB Module%sA datamodule for WEB (HTTP) applications."
+msgstr "Módulo Web%sUm módulo de dados para aplicações Web (HTTP)."
+
diff --git a/components/fpweb/languages/weblazideintf.po b/components/fpweb/languages/weblazideintf.po
new file mode 100644
index 0000000000..4e5781231b
--- /dev/null
+++ b/components/fpweb/languages/weblazideintf.po
@@ -0,0 +1,59 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: weblazideintf.rsapachemodule
+msgid "Apache Module"
+msgstr ""
+
+#: weblazideintf.rsapachemodule2
+msgid "Apache module%sAn Apache loadable module in Free Pascal using webmodules. The main library file is automatically maintained by Lazarus."
+msgstr ""
+
+#: weblazideintf.rscgiapplicati
+msgid "CGI Application"
+msgstr ""
+
+#: weblazideintf.rscgiapplicati2
+msgid "CGI Application%sA CGI (Common Gateway Interface) program in Free Pascal using webmodules. The program source is automatically maintained by Lazarus."
+msgstr ""
+
+#: weblazideintf.rscustomcgiapp
+msgid "Custom CGI Application"
+msgstr ""
+
+#: weblazideintf.rscustomcgiapp2
+msgid "Custom CGI Application%sA CGI (Common Gateway Interface) program in Free Pascal. The program source is automatically maintained by Lazarus."
+msgstr ""
+
+#: weblazideintf.rscustomfastcg
+msgid "Custom FastCGI Application"
+msgstr ""
+
+#: weblazideintf.rscustomfastcg2
+msgid "Custom FastCGI Application%sA FastCGI (Common Gateway Interface) program in Free Pascal. The program source is automatically maintained by Lazarus."
+msgstr ""
+
+#: weblazideintf.rsfastcgiappli
+msgid "FastCGI Application"
+msgstr ""
+
+#: weblazideintf.rsfastcgiappli2
+msgid "FastCGI Application%sA FastCGI (Common Gateway Interface) program in Free Pascal using webmodules. The program source is automatically maintained by Lazarus."
+msgstr ""
+
+#: weblazideintf.rshtmlwebmodul
+msgid "HTML Web Module"
+msgstr ""
+
+#: weblazideintf.rshtmlwebmodul2
+msgid "HTML WEB Module%sA Web datamodule for producing strict HTML."
+msgstr ""
+
+#: weblazideintf.rswebmodule
+msgid "Web Module"
+msgstr ""
+
+#: weblazideintf.rswebmoduleada
+msgid "WEB Module%sA datamodule for WEB (HTTP) applications."
+msgstr ""
+
diff --git a/components/fpweb/languages/weblazideintf.ru.po b/components/fpweb/languages/weblazideintf.ru.po
new file mode 100644
index 0000000000..629330b629
--- /dev/null
+++ b/components/fpweb/languages/weblazideintf.ru.po
@@ -0,0 +1,67 @@
+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"
+
+#: weblazideintf.rsapachemodule
+msgid "Apache Module"
+msgstr "Модуль Apache"
+
+#: weblazideintf.rsapachemodule2
+msgid "Apache module%sAn Apache loadable module in Free Pascal using webmodules. The main library file is automatically maintained by Lazarus."
+msgstr "Модуль Apache%sЗагружаемый модуль Apache на Free Pascal с использованием веб-модулей. Исходный код библиотеки автоматически поддерживается Lazarus."
+
+#: weblazideintf.rscgiapplicati
+msgid "CGI Application"
+msgstr "Приложение CGI"
+
+#: weblazideintf.rscgiapplicati2
+msgid "CGI Application%sA CGI (Common Gateway Interface) program in Free Pascal using webmodules. The program source is automatically maintained by Lazarus."
+msgstr "Приложение CGI%sПрограмма CGI (Common Gateway Interface) на Free Pascal с использованием веб-модулей. Исходный код программы автоматически поддерживается Lazarus."
+
+#: weblazideintf.rscustomcgiapp
+msgid "Custom CGI Application"
+msgstr "Пользовательское приложение CGI"
+
+#: weblazideintf.rscustomcgiapp2
+msgid "Custom CGI Application%sA CGI (Common Gateway Interface) program in Free Pascal. The program source is automatically maintained by Lazarus."
+msgstr "Пользовательское приложение CGI%sПрограмма CGI (Common Gateway Interface) на Free Pascal. Исходный код программы автоматически поддерживается Lazarus."
+
+#: weblazideintf.rscustomfastcg
+msgid "Custom FastCGI Application"
+msgstr "Пользовательское приложение FastCGI"
+
+#: weblazideintf.rscustomfastcg2
+msgid "Custom FastCGI Application%sA FastCGI (Common Gateway Interface) program in Free Pascal. The program source is automatically maintained by Lazarus."
+msgstr "Пользовательское приложение FastCGI%sПрограмма FastCGI (Common Gateway Interface) на Free Pascal. Исходный код программы автоматически поддерживается Lazarus."
+
+#: weblazideintf.rsfastcgiappli
+msgid "FastCGI Application"
+msgstr "Приложение FastCGI"
+
+#: weblazideintf.rsfastcgiappli2
+msgid "FastCGI Application%sA FastCGI (Common Gateway Interface) program in Free Pascal using webmodules. The program source is automatically maintained by Lazarus."
+msgstr "Приложение FastCGI%sПрограмма FastCGI (Common Gateway Interface) на Free Pascal с использованием веб-модулей. Исходный код программы автоматически поддерживается Lazarus."
+
+#: weblazideintf.rshtmlwebmodul
+msgid "HTML Web Module"
+msgstr "Веб-модуль HTML"
+
+#: weblazideintf.rshtmlwebmodul2
+msgid "HTML WEB Module%sA Web datamodule for producing strict HTML."
+msgstr "Веб-модуль HTML%sМодуль данных веб для создания Strict HTML."
+
+#: weblazideintf.rswebmodule
+msgid "Web Module"
+msgstr "Веб-модуль"
+
+#: weblazideintf.rswebmoduleada
+msgid "WEB Module%sA datamodule for WEB (HTTP) applications."
+msgstr "Веб-модуль%sМодуль данных для приложений веб (HTTP)."
+
diff --git a/components/fpweb/lazwebextra.lpk b/components/fpweb/lazwebextra.lpk
index 03b4ecf137..8f858e48cf 100644
--- a/components/fpweb/lazwebextra.lpk
+++ b/components/fpweb/lazwebextra.lpk
@@ -4,11 +4,16 @@
     <Name Value="lazwebextra"/>
     <AddToProjectUsesSection Value="False"/>
     <CompilerOptions>
-      <Version Value="8"/>
+      <Version Value="9"/>
       <SearchPaths>
         <OtherUnitFiles Value="/home/michael/public_html/extjs/"/>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/>
       </SearchPaths>
+      <Parsing>
+        <SyntaxOptions>
+          <UseAnsiStrings Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
       <CodeGeneration>
         <Optimizations>
           <OptimizationLevel Value="0"/>
@@ -73,6 +78,10 @@
         <UnitName Value="webjsonrpc"/>
       </Item11>
     </Files>
+    <i18n>
+      <EnableI18N Value="True"/>
+      <OutDir Value="languages"/>
+    </i18n>
     <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="2">
       <Item1>
diff --git a/components/fpweb/reglazwebextra.pp b/components/fpweb/reglazwebextra.pp
index f2f9b290db..a99cf2b162 100644
--- a/components/fpweb/reglazwebextra.pp
+++ b/components/fpweb/reglazwebextra.pp
@@ -51,6 +51,18 @@ Type
 
 Procedure Register;
 
+resourcestring
+  rsWebDataProvi = 'Web DataProvider Module';
+  rsWEBDataProvi2 = 'WEB DataProvider Module%sA datamodule to handle data '
+    +'requests for WEB (HTTP) applications using WebDataProvider components.';
+  rsWebJSONRPCMo = 'Web JSON-RPC Module';
+  rsWEBJSONRPCMo2 = 'WEB JSON-RPC Module%sA datamodule to dispatch JSON-RPC '
+    +'requests in WEB (HTTP) applications using TJSONRPCHandler components.';
+  rsWebExtDirect = 'Web Ext.Direct Module';
+  rsWEBExtDirect2 = 'WEB Ext.Direct Module%sA datamodule to dispatch Ext.'
+    +'Direct requests in WEB (HTTP) applications using TJSONRPCHandler '
+    +'components.';
+
 Var
    FileDescriptorWebProviderDataModule: TFileDescWebProviderDataModule;
    FileDescriptorJSONRPCModule : TFileDescWebJSONRPCModule;
@@ -99,13 +111,12 @@ end;
 
 function TFileDescWebProviderDataModule.GetLocalizedName: string;
 begin
-  Result:='Web DataProvider Module';
+  Result:=rsWebDataProvi;
 end;
 
 function TFileDescWebProviderDataModule.GetLocalizedDescription: string;
 begin
-  Result:='WEB DataProvider Module'#13
-         +'A datamodule to handle data requests for WEB (HTTP) applications using WebDataProvider components.';
+  Result:=Format(rsWEBDataProvi2, [#13]);
 end;
 
 function TFileDescWebProviderDataModule.GetImplementationSource(const Filename,
@@ -135,13 +146,12 @@ end;
 
 function TFileDescWebJSONRPCModule.GetLocalizedName: string;
 begin
-  Result:='Web JSON-RPC Module';
+  Result:=rsWebJSONRPCMo;
 end;
 
 function TFileDescWebJSONRPCModule.GetLocalizedDescription: string;
 begin
-  Result:='WEB JSON-RPC Module'#13
-         +'A datamodule to dispatch JSON-RPC requests in WEB (HTTP) applications using TJSONRPCHandler components.';
+  Result:=Format(rsWEBJSONRPCMo2, [#13]);
 end;
 
 function TFileDescWebJSONRPCModule.GetImplementationSource(const Filename,
@@ -196,13 +206,12 @@ end;
 function TFileDescExtDirectModule.GetLocalizedName: string;
 begin
   Result:=inherited GetLocalizedName;
-  Result:='Web Ext.Direct Module';
+  Result:=rsWebExtDirect;
 end;
 
 function TFileDescExtDirectModule.GetLocalizedDescription: string;
 begin
-  Result:='WEB Ext.Direct Module'#13
-         +'A datamodule to dispatch Ext.Direct requests in WEB (HTTP) applications using TJSONRPCHandler components.';
+  Result:=Format(rsWEBExtDirect2, [#13]);
 end;
 
 function TFileDescExtDirectModule.GetImplementationSource(const Filename,
diff --git a/components/fpweb/weblaz.lpk b/components/fpweb/weblaz.lpk
index d0752babfd..94783868fc 100644
--- a/components/fpweb/weblaz.lpk
+++ b/components/fpweb/weblaz.lpk
@@ -3,13 +3,15 @@
   <Package Version="3">
     <Name Value="weblaz"/>
     <CompilerOptions>
-      <Version Value="5"/>
+      <Version Value="9"/>
       <SearchPaths>
         <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
-      <CodeGeneration>
-        <Generate Value="Faster"/>
-      </CodeGeneration>
+      <Parsing>
+        <SyntaxOptions>
+          <UseAnsiStrings Value="False"/>
+        </SyntaxOptions>
+      </Parsing>
       <Other>
         <CustomOptions Value="-dcgidebug
 "/>
@@ -99,6 +101,10 @@
         <UnitName Value="fpapache"/>
       </Item16>
     </Files>
+    <i18n>
+      <EnableI18N Value="True"/>
+      <OutDir Value="languages"/>
+    </i18n>
     <Type Value="RunAndDesignTime"/>
     <RequiredPkgs Count="3">
       <Item1>
@@ -113,7 +119,7 @@
       </Item3>
     </RequiredPkgs>
     <UsageOptions>
-      <UnitPath Value="$(PkgOutDir)"/>
+      <UnitPath Value="$(PkgOutDir)/"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
diff --git a/components/fpweb/weblazideintf.pp b/components/fpweb/weblazideintf.pp
index 0f899be403..5b47006831 100644
--- a/components/fpweb/weblazideintf.pp
+++ b/components/fpweb/weblazideintf.pp
@@ -117,6 +117,33 @@ var
 
 procedure Register;
 
+resourcestring
+  rsCGIApplicati = 'CGI Application';
+  rsCGIApplicati2 = 'CGI Application%sA CGI (Common Gateway Interface) '
+    +'program in Free Pascal using webmodules. The program source is '
+    +'automatically maintained by Lazarus.';
+  rsCustomCGIApp = 'Custom CGI Application';
+  rsCustomCGIApp2 = 'Custom CGI Application%sA CGI (Common Gateway Interface) '
+    +'program in Free Pascal. The program source is automatically maintained '
+    +'by Lazarus.';
+  rsWebModule = 'Web Module';
+  rsWEBModuleADa = 'WEB Module%sA datamodule for WEB (HTTP) applications.';
+  rsHTMLWebModul = 'HTML Web Module';
+  rsHTMLWEBModul2 = 'HTML WEB Module%sA Web datamodule for producing strict '
+    +'HTML.';
+  rsApacheModule = 'Apache Module';
+  rsApacheModule2 = 'Apache module%sAn Apache loadable module in Free Pascal '
+    +'using webmodules. The main library file is automatically maintained by '
+    +'Lazarus.';
+  rsCustomFastCG = 'Custom FastCGI Application';
+  rsCustomFastCG2 = 'Custom FastCGI Application%sA FastCGI (Common Gateway '
+    +'Interface) program in Free Pascal. The program source is automatically '
+    +'maintained by Lazarus.';
+  rsFastCGIAppli = 'FastCGI Application';
+  rsFastCGIAppli2 = 'FastCGI Application%sA FastCGI (Common Gateway '
+    +'Interface) program in Free Pascal using webmodules. The program source '
+    +'is automatically maintained by Lazarus.';
+
 implementation
 
 uses LazarusPackageIntf,FormEditingIntf;
@@ -184,14 +211,12 @@ end;
 
 function TCGIApplicationDescriptor.GetLocalizedName: string;
 begin
-  Result:='CGI Application';
+  Result:=rsCGIApplicati;
 end;
 
 function TCGIApplicationDescriptor.GetLocalizedDescription: string;
 begin
-  Result:='CGI Application'#13#13'A CGI (Common Gateway Interface) program '
-          +'in Free Pascal using webmodules. The program source is '
-          +'automatically maintained by Lazarus.';
+  Result:=Format(rsCGIApplicati2, [#13#13]);
 end;
 
 function TCGIApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
@@ -253,14 +278,12 @@ end;
 
 function TCustomCGIApplicationDescriptor.GetLocalizedName: string;
 begin
-  Result:='Custom CGI Application';
+  Result:=rsCustomCGIApp;
 end;
 
 function TCustomCGIApplicationDescriptor.GetLocalizedDescription: string;
 begin
-  Result:='Custom CGI Application'#13#13'A CGI (Common Gateway Interface) program '
-          +'in Free Pascal. The program source is '
-          +'automatically maintained by Lazarus.';
+  Result:=Format(rsCustomCGIApp2, [#13#13]);
 end;
 
 function TCustomCGIApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
@@ -341,13 +364,12 @@ end;
 
 function TFileDescWebDataModule.GetLocalizedName: string;
 begin
-  Result:='Web Module';
+  Result:=rsWebModule;
 end;
 
 function TFileDescWebDataModule.GetLocalizedDescription: string;
 begin
-  Result:='WEB Module'#13
-         +'A datamodule for WEB (HTTP) applications.';
+  Result:=Format(rsWEBModuleADa, [#13]);
 end;
 
 function TFileDescWebDataModule.GetImplementationSource(const Filename, SourceName, ResourceName: string): string;
@@ -375,13 +397,12 @@ end;
 
 function TFileDescHTMLModule.GetLocalizedName: string;
 begin
-  Result:='HTML Web Module';
+  Result:=rsHTMLWebModul;
 end;
 
 function TFileDescHTMLModule.GetLocalizedDescription: string;
 begin
-  Result:='HTML WEB Module'#13
-         +'A Web datamodule for producing strict HTML.';
+  Result:=Format(rsHTMLWEBModul2, [#13]);
 end;
 
 function TFileDescHTMLModule.GetImplementationSource(const Filename, SourceName, ResourceName: string): string;
@@ -401,14 +422,12 @@ end;
 
 function TApacheApplicationDescriptor.GetLocalizedName: string;
 begin
-  Result:='Apache Module';
+  Result:=rsApacheModule;
 end;
 
 function TApacheApplicationDescriptor.GetLocalizedDescription: string;
 begin
-  Result:='Apache module'#13#13'An Apache loadable module '
-          +'in Free Pascal using webmodules. The main library file is '
-          +'automatically maintained by Lazarus.';
+  Result:=Format(rsApacheModule2, [#13#13]);
 end;
 
 function TApacheApplicationDescriptor.InitProject(AProject: TLazProject): TModalResult;
@@ -494,14 +513,12 @@ end;
 
 function TCustomFCGIApplicationDescriptor.GetLocalizedName: string;
 begin
-  Result:='Custom FastCGI Application';
+  Result:=rsCustomFastCG;
 end;
 
 function TCustomFCGIApplicationDescriptor.GetLocalizedDescription: string;
 begin
-  Result:='Custom FastCGI Application'#13#13'A FastCGI (Common Gateway Interface) program '
-          +'in Free Pascal. The program source is '
-          +'automatically maintained by Lazarus.';
+  Result:=Format(rsCustomFastCG2, [#13#13]);
 end;
 
 function TCustomFCGIApplicationDescriptor.InitProject(AProject: TLazProject
@@ -576,14 +593,12 @@ end;
 
 function TFCGIApplicationDescriptor.GetLocalizedName: string;
 begin
-  Result:='FastCGI Application';
+  Result:=rsFastCGIAppli;
 end;
 
 function TFCGIApplicationDescriptor.GetLocalizedDescription: string;
 begin
-  Result:='FastCGI Application'#13#13'A FastCGI (Common Gateway Interface) program '
-          +'in Free Pascal using webmodules. The program source is '
-          +'automatically maintained by Lazarus.';
+  Result:=Format(rsFastCGIAppli2, [#13#13]);
 end;
 
 function TFCGIApplicationDescriptor.InitProject(AProject: TLazProject