diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_cs.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_cs.properties
index 22ed2f05d..4ac7bf740 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_cs.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_cs.properties
@@ -33,8 +33,8 @@ UIHomePagePortlet.Label.Intro=Nov\u00e1 verze p\u0159ich\u00e1z\u00ed s revolu\u
 UIHomePagePortlet.Label.IntroText=GateIn je nov\u00e1 generace Open Source port\u00e1lu, vytvo\u0159en\u00e1 spole\u010dnostmi Red Hat a eXo Platform. Stali se partnery, aby spojily nejlep\u0161\u00ed experty a komunity kolem robustn\u00edho a intuitivn\u00edho port\u00e1lu, kter\u00fd p\u0159in\u00e1\u0161\u00ed mnoho funkc\u00ed pro u\u017eivatele a administr\u00e1tory IT syst\u00e9m\u016f.
 UIHomePagePortlet.Label.Manager=Mana\u017eer
 UIHomePagePortlet.Label.Password=Heslo:
-UIHomePagePortlet.Label.Slogan=To nejlep\u0161\u00ed z eXo a JBoss Port\u00e1lu<div>GateIn 3.3</div>
-UIHomePagePortlet.Label.Title=Zkuste GateIn 3.3 s jedn\u00edm z t\u011bchto u\u017eivatelsk\u00fdch \u00fa\u010dt\u016f:
+UIHomePagePortlet.Label.Slogan=To nejlep\u0161\u00ed z eXo a JBoss Port\u00e1lu<div>GateIn #{gatein.version}</div>
+UIHomePagePortlet.Label.Title=Zkuste GateIn #{gatein.version} s jedn\u00edm z t\u011bchto u\u017eivatelsk\u00fdch \u00fa\u010dt\u016f:
 UIHomePagePortlet.Label.User=U\u017eivatel
 UIHomePagePortlet.Label.Username=U\u017eivatelsk\u00e9 jm\u00e9no:
 
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties
index 64f580567..2d5969963 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_de.properties
@@ -33,8 +33,8 @@ UIBannerPortlet.action.register=Registrieren
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=Testen Sie GateIn 3.3 mit einem dieser Benutzerkonten:
-UIHomePagePortlet.Label.Slogan=Das Beste aus eXo und JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=Testen Sie GateIn #{gatein.version} mit einem dieser Benutzerkonten:
+UIHomePagePortlet.Label.Slogan=Das Beste aus eXo und JBoss Portal<div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.Username=Name:
 UIHomePagePortlet.Label.Password=Passwort:
 
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties
index 31a904095..e091ef72f 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties
@@ -33,8 +33,8 @@ UIBannerPortlet.action.register=Register
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=Try GateIn 3.3 with one of these user accounts:
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=Try GateIn #{gatein.version} with one of these user accounts:
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.GuideText=For more information, please contact us.
 UIHomePagePortlet.Label.IntroText=GateIn is the new generation of Open Source portal, jointly led by Red Hat and eXo Platform who partner to gather the best portal experts and communities around a robust and intuitive portal that brings rich administration functionalities to IT systems.
 UIHomePagePortlet.Label.Administrator=Administrator
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties
index 71fe71292..307fa8349 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties
@@ -33,8 +33,8 @@ UIBannerPortlet.action.register=Registrarse
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=Prueba GateIn 3.3 con uno de los siguientes usuarios:
-UIHomePagePortlet.Label.Slogan=Lo mejor de eXo y JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=Prueba GateIn #{gatein.version} con uno de los siguientes usuarios:
+UIHomePagePortlet.Label.Slogan=Lo mejor de eXo y JBoss Portal<div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.Username=Usuario:
 UIHomePagePortlet.Label.Password=Contrase\u00f1a:
 
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_fr.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_fr.properties
index 3376f99a4..2c0d202dc 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_fr.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_fr.properties
@@ -33,7 +33,7 @@ UIBannerPortlet.action.register=S'enregistrer
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=Essayez GateIn 3.3 avec l'un de ces comptes:
-UIHomePagePortlet.Label.Slogan=Le meilleur d'eXo et de JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=Essayez GateIn #{gatein.version} avec l'un de ces comptes:
+UIHomePagePortlet.Label.Slogan=Le meilleur d'eXo et de JBoss Portal<div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.Username=Identifiant:
 UIHomePagePortlet.Label.Password=Mot de passe:
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties
index ca1683404..6d273f9f9 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties
@@ -33,8 +33,8 @@ UIBannerPortlet.action.register=Registrati
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=Prova GateIn 3.3 con uno di questi account utente:
-UIHomePagePortlet.Label.Slogan=Il meglio di eXo e JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=Prova GateIn #{gatein.version} con uno di questi account utente:
+UIHomePagePortlet.Label.Slogan=Il meglio di eXo e JBoss Portal<div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.GuideText=Contattaci per maggiori informazioni.
 UIHomePagePortlet.Label.IntroText=GateIn \u00E8 la nuova generazione di portali Open Source, esclusivamente fornito da Red Hat ed eXo Platform ai sistemi IT che raccolgono i migliori partner esperti di tecnologie sui portali e una community che gira intorno ad un portale robusto ed intuitivo e ricco di funzionalit\u00E0 di amministrazione.
 UIHomePagePortlet.Label.Administrator=Amministratore
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties
index 41d0c6626..1a0952a85 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties
@@ -37,9 +37,9 @@ UIBannerPortlet.action.changeLanguage=\u8a00\u8a9e\u3092\u5909\u66f4
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=\u3053\u308c\u3089\u30e6\u30fc\u30b6\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u4e00\u3064\u3067GateIn 3.3\u3092\u8a66\u3057\u3066\u304f\u3060\u3055\u3044:
+UIHomePagePortlet.Label.Title=\u3053\u308c\u3089\u30e6\u30fc\u30b6\u30a2\u30ab\u30a6\u30f3\u30c8\u306e\u4e00\u3064\u3067GateIn #{gatein.version}\u3092\u8a66\u3057\u3066\u304f\u3060\u3055\u3044:
 
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn #{gatein.version}</div>
 
 UIHomePagePortlet.Label.Username=\u30e6\u30fc\u30b6\u30fc\u540d:
 
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml
index 4f377cd49..a97885e3f 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml
@@ -24,8 +24,8 @@
    
    <UIHomePagePortlet>
       <Label>
-         <Title>사용자 계정들 중 하나와 함께 GateIn 3.2을 시도하십시오.</Title>
-         <Slogan>최고의 eXo 및 JBoss Portal<div>GateIn 3.2</div></Slogan>
+         <Title>사용자 계정들 중 하나와 함께 GateIn #{gatein.version}을 시도하십시오.</Title>
+         <Slogan>최고의 eXo 및 JBoss Portal<div>GateIn #{gatein.version}</div></Slogan>
          <Username>사용자이름:</Username>
          <Password>비밀번호:</Password>
       </Label>
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties
index 7cbeba67c..f071415f6 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties
@@ -33,8 +33,8 @@ UIBannerPortlet.action.changeLanguage=\u092d\u093e\u0937\u093e \u092c\u0926\u093
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=\u092f\u0940 \u092e\u0927\u094d\u092f\u0947 \u0915\u0941\u0928\u0948 \u092a\u094d\u0930\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u0916\u093e\u0924\u093e\u0939\u0930\u0941\u0932\u0947 GateIn 3.3\u092e\u093e \u092a\u094d\u0930\u092f\u093e\u0938 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=\u092f\u0940 \u092e\u0927\u094d\u092f\u0947 \u0915\u0941\u0928\u0948 \u092a\u094d\u0930\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u0916\u093e\u0924\u093e\u0939\u0930\u0941\u0932\u0947 GateIn #{gatein.version}\u092e\u093e \u092a\u094d\u0930\u092f\u093e\u0938 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.Username=\u092a\u094d\u0930\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u0928\u093e\u092e: 
 UIHomePagePortlet.Label.Password=\u092a\u093e\u0938\u094d\u0935\u094b\u0930\u094d\u0921:
 
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties
index da4589c01..bc283dfd7 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties
@@ -33,8 +33,8 @@ UIBannerPortlet.action.changeLanguage=Verander taal
 #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
 #############################################################################
 
-UIHomePagePortlet.Label.Title=Probeer GateIn 3.3 met \u00E9\u00E9n van deze gebruikersaccounts:
-UIHomePagePortlet.Label.Slogan=Het beste van eXo en JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=Probeer GateIn #{gatein.version} met \u00E9\u00E9n van deze gebruikersaccounts:
+UIHomePagePortlet.Label.Slogan=Het beste van eXo en JBoss Portal<div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.Username=Gebruikersnaam:
 UIHomePagePortlet.Label.Password=Paswoord:
 
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties
index 598523057..2580f2c6f 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_pt_BR.properties
@@ -33,8 +33,8 @@ UIBannerPortlet.action.changeLanguage=Mudar Linguagem
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=Experimente GateIn 3.3 com uma das contas:
-UIHomePagePortlet.Label.Slogan=O melhor de eXo e JBoss Portal <div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=Experimente GateIn #{gatein.version} com uma das contas:
+UIHomePagePortlet.Label.Slogan=O melhor de eXo e JBoss Portal <div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.Username=Usuário:
 UIHomePagePortlet.Label.Password=Senha:
 
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties
index cc4b09869..6ed023406 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties
@@ -14,7 +14,7 @@ UIBannerPortlet.action.register=Register
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=Используйте GateIn 3.3 с одной из учётных записей:
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=Используйте GateIn #{gatein.version} с одной из учётных записей:
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.Username=Имя:
 UIHomePagePortlet.Label.Password=Пароль:
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties
index 9fa674bc3..c787d795f 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties
@@ -15,7 +15,7 @@ UIBannerPortlet.action.register=Register
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=Спробуй GateIn 3.3 з користувачем серед таких облікових записів:
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=Спробуй GateIn #{gatein.version} з користувачем серед таких облікових записів:
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.Username=Ім'я користувача:
 UIHomePagePortlet.Label.Password=Пароль:
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties
index 50950794c..66070d8d4 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties
@@ -33,8 +33,8 @@ UIBannerPortlet.action.register=Đăng ký
   #org.exoplatform.portal.webui.component.UIHomePagePortlet															#
   #############################################################################
   
-UIHomePagePortlet.Label.Title=Dùng thử GateIn 3.3 với một trong những tài khoản sau:
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.3</div>
+UIHomePagePortlet.Label.Title=Dùng thử GateIn #{gatein.version} với một trong những tài khoản sau:
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn #{gatein.version}</div>
 UIHomePagePortlet.Label.GuideText=Để biết thêm thông tin xin hãy liên lạc với chúng tôi.
 UIHomePagePortlet.Label.IntroText=GateIn là cổng thông tin thế hệ mới kết hợp giữa Red Hat và eXo Platform, tập trung những chuyên gia về cổng thông tin và cộng đồng tốt nhất, mang lại cho các hệ thống thông tin những tính năng đầy đủ nhất.
 UIHomePagePortlet.Label.Administrator=Quản trị
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml
index 0e6818101..1c56d0de8 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml
@@ -24,8 +24,8 @@
  
    <UIHomePagePortlet>
       <Label>
-         <Title>用一个用户帐户尝试GateIn 3.2：</Title>
-         <Slogan>eXo和JBoss Portal最好的门户平台<div>GateIn 3.2</div></Slogan>
+         <Title>用一个用户帐户尝试GateIn #{gatein.version}：</Title>
+         <Slogan>eXo和JBoss Portal最好的门户平台<div>GateIn #{gatein.version}</div></Slogan>
          <Username>用户名：</Username>
          <Password>密码：</Password>
       </Label>
diff --git a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml
index d1ba858b8..7f39cdb5b 100644
--- a/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml
+++ b/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml
@@ -23,8 +23,8 @@
 
 <UIHomePagePortlet>
 <Label>
-<Title>讓你感受全新體驗的 JBoss GateIn 3.2：</Title>
-<Slogan>eXo和JBoss Portal最好的Portal平台<div>GateIn 3.2</div></Slogan>
+<Title>讓你感受全新體驗的 JBoss GateIn #{gatein.version}：</Title>
+<Slogan>eXo和JBoss Portal最好的Portal平台<div>GateIn #{gatein.version}</div></Slogan>
 <Username>用戶名：</Username>
 <Password>密碼：</Password>
 </Label>
diff --git a/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties b/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties
index da5719cf7..9c18a4f8e 100644
--- a/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties
+++ b/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.properties
@@ -17,6 +17,9 @@
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 #
 
+# GateIn version
+gatein.version=3.4
+
 ###################################################################
 #                  EXPRESSION START  WITH 'A'                     #
 ###################################################################
diff --git a/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml b/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml
deleted file mode 100644
index d01d8f8f7..000000000
--- a/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/expression_en.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (C) 2009 eXo Platform SAS.
-    
-    This is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Lesser General Public License as
-    published by the Free Software Foundation; either version 2.1 of
-    the License, or (at your option) any later version.
-    
-    This software is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-    Lesser General Public License for more details.
-    
-    You should have received a copy of the GNU Lesser General Public
-    License along with this software; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
--->
-
-<bundle>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'A'                     #
-  ###################################################################
-  -->
-  <word>
-    <accessPermission>Access Permission</accessPermission>
-    <abort>Abort</abort>
-    <action>Action</action>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'B'                     #
-  ###################################################################
-  -->
-    <back>Back</back>
-    <birthday>Birthday</birthday>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'c'                     #
-  ###################################################################
-  -->
-    <cancel>Cancel</cancel>
-    <category>Category</category>
-    <change>Change</change>
-    <city>City</city>
-    <close>Close</close>
-    <comment>Comment</comment>
-    <content>Content</content>
-    <country>Country</country>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'd'                     #
-  ###################################################################
-  -->
-    <date>Date</date>
-    <decorator>Decorator</decorator>
-    <department>Department</department>
-    <description>Description</description>
-    <displayName>Display Name</displayName>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'e'                     #
-  ###################################################################
-  -->
-    <editPermission>Edit Permission</editPermission>
-    <email>Email</email>
-    <employer>Employer</employer>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'f'                     #
-  ###################################################################
-  -->
-    <familyName>Family Name</familyName>
-    <finish>Finish</finish>
-    <firstName>First Name</firstName>
-    <format>Format</format>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'g'                     #
-  ###################################################################
-  -->
-    <groupId>Group Id</groupId>
-    <gender>Gender</gender>
-    <givenName>Given Name</givenName>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'h'                     #
-  ###################################################################
-  -->
-    <height>Height</height>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'i'                     #
-  ###################################################################
-  -->
-    <icon>Icon</icon>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'j'                     #
-  ###################################################################
-  -->
-    <jobTitle>Job Title</jobTitle>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'l'                     #
-  ###################################################################
-  -->
-    <locale>Locale</locale>
-    <label>Label</label>
-    <language>Language</language>
-    <lastName>Last Name</lastName>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'm'                     #
-  ###################################################################
-  -->
-    <mobile>Mobile</mobile>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'n'                     #
-  ###################################################################
-  -->
-    <name>Name</name>
-    <nickName>Nick Name</nickName>
-    <next>Next</next>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'o'                     #
-  ###################################################################
-  -->
-    <owner>Owner</owner>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'p'                     #
-  ###################################################################
-  -->
-    <postalCode>Postal Code</postalCode>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'r'                     #
-  ###################################################################
-  -->
-    <refresh>Refresh</refresh>
-    <restore>Restore</restore>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 's'                     #
-  ###################################################################
-  -->
-    <save>Save</save>
-    <stateProv>State/Prov</stateProv>
-    <street>Street</street>
-    <style>Style</style>
-    <subject>Subject</subject>
-    <summary>Summary</summary>
-    <skin>Skin</skin>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 't'                     #
-  ###################################################################
-  -->
-    <template>Template</template>
-    <tel>Tel</tel>
-    <title>Title</title>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'u'                     #
-  ###################################################################
-  -->
-    <uri>Uri</uri>
-    <userName>User Name</userName>
-    <update>Update</update>
-  <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'v'                     #
-  ###################################################################
-  -->
-    <viewPermission>View Permission</viewPermission>
-   <!--
-  ###################################################################
-  #                  EXPRESSION START  WITH 'w'                     #
-  ###################################################################
-  -->
-    <width>Width</width>
-    <website>Website</website>
-  </word>
-           
-</bundle>
-