diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 2daae7cb9..0393815b0 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -7,6 +7,7 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= favicon %>
 <%= stylesheet_link_tag 'application', :media => 'all' %>
+<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_include_tag :defaults %>
 <%= heads_for_wiki_formatter %>
 <!--[if IE]>
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 320c2091d..d31abee4e 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1,4 +1,5 @@
 bg:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 3d476ae13..fbc0c28e2 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1,6 +1,7 @@
 #Ernad Husremovic hernad@bring.out.ba
 
 bs:
+  direction: ltr
   date:
     formats:
       default: "%d.%m.%Y"
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 913d2f3ab..b9adf3e17 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1,4 +1,5 @@
 ca:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 9ceb21e83..88bb99e84 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1,4 +1,5 @@
 cs:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/da.yml b/config/locales/da.yml
index b241a52d8..f70deb02a 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -3,6 +3,7 @@
 # updated and upgraded to 0.9 by Morten Krogh Andersen (http://www.krogh.net)
 
 da:
+  direction: ltr
   date:
     formats:
       default: "%d.%m.%Y"
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 411e9e9ff..576170328 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -2,6 +2,7 @@
 # by Clemens Kofler (clemens@railway.at)
 
 de:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/el.yml b/config/locales/el.yml
index cb4941c29..d505c3808 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -2,6 +2,7 @@
 # by Vaggelis Typaldos (vtypal@gmail.com),  Spyros Raptis (spirosrap@gmail.com)
 
 el:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 24aa6e9c6..e087c358a 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1,4 +1,5 @@
 en-GB:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b3d87515d..a6b6a4f04 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,6 @@
 en:
+  # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
@@ -64,6 +66,11 @@ en:
         other: "almost {{count}} years"
 
   number:
+    # Default format for numbers
+    format:
+      separator: "." 
+      delimiter: ""
+      precision: 3
     human:
       format:
         delimiter: ""
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e7abd4347..8f996b12e 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -141,6 +141,7 @@ es:
       attributes:
         # Overrides model and default messages.
 
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 350f238c5..a5937cf35 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -3,6 +3,7 @@
 # 2010-01-25
 # Distributed under the same terms as the Redmine itself.
 eu:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index b6b48bac0..4645b69d5 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -2,6 +2,7 @@
 # by Marko Seppä (marko.seppa@gmail.com)
 
 fi:
+  direction: ltr
   date:
     formats:
       default: "%e. %Bta %Y"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8eb82ad73..ff3be7513 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -4,6 +4,7 @@
 # contributor: Thibaut Cuvelier - Developpez.com
 
 fr:
+  direction: ltr
   date:
     formats:
       default: "%d/%m/%Y"
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 2a1d97ed7..68d26ba54 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -45,6 +45,7 @@ gl:
           tb: "TB"
   
   
+  direction: ltr
   date:
     formats:
       default:  "%e/%m/%Y"
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 532c60195..053776cd5 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -3,6 +3,7 @@
 # Jul 2010 - Updated by Orgad Shaneh (orgads@gmail.com)
 
 he:
+  direction: rtl
   date:
     formats:
       default: "%d/%m/%Y"
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 442adefef..7324e427c 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -2,6 +2,7 @@
 # by Helix d.o.o. (info@helix.hr)
 
 hr:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 088027f1a..8c1a1bb4c 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -6,6 +6,7 @@
 # updated by Gábor Takács (taky77@gmail.com)
 
 "hu":
+  direction: ltr
   date:
     formats:
       default: "%Y.%m.%d."
diff --git a/config/locales/id.yml b/config/locales/id.yml
index ec6688e5d..7ea96f5ac 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -2,6 +2,7 @@
 # by Raden Prabowo (cakbowo@gmail.com)
 
 id:
+  direction: ltr
   date:
     formats:
       default: "%d-%m-%Y"
diff --git a/config/locales/it.yml b/config/locales/it.yml
index aec2c8ea0..37f0b4139 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -3,6 +3,7 @@
 # by Diego Pierotto (ita.translations@tiscali.it)
 
 it:
+  direction: ltr
   date:
     formats:
       default: "%d-%m-%Y"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 4c513fef2..26db1d237 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -3,6 +3,7 @@
 # AR error messages are basically taken from Ruby-GetText-Package. Thanks to Masao Mutoh.
 
 ja:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index d79c86cb9..1998e760e 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -4,6 +4,7 @@
 # by Yonghwan SO(please insert your email), last update at 2009-09-11
 # last update at 2010-01-23 by Kihyun Yoon
 ko:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 9bcafc71b..1aad33743 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -4,6 +4,7 @@
 #                      and Sergej Jegorov sergej.jegorov@gmail.com
 #					   and Gytis Gurklys gytis.gurklys@gmail.com
 lt:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index 70822de51..70bc4f79b 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1,6 +1,7 @@
 # translated by Dzintars Bergs (dzintars.bergs@gmail.com)
 
 lv:
+  direction: ltr
   date:
     formats:
       default: "%d.%m.%Y"
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 5b4b79e86..713890ddc 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -1,4 +1,5 @@
 mn:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 46c5ca867..d86a00bb9 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1,4 +1,5 @@
 nl:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 7d49537df..9603c92c4 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -3,6 +3,7 @@
   support:
     array:
       sentence_connector: "og"
+  direction: ltr
   date:
     formats:
       default: "%d.%m.%Y"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 2dadc8478..2deeb9e48 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -33,6 +33,7 @@ pl:
           gb: "GB"
           tb: "TB"
 
+  direction: ltr
   date:
     formats:
       default: "%Y-%m-%d"
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index a66f23718..1cb7f2583 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1,5 +1,6 @@
 pt-BR:
   # formatos de data e hora
+  direction: ltr
   date:
     formats:
       default: "%d/%m/%Y"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 615f31645..c7bbe5b62 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -6,6 +6,7 @@ pt:
       sentence_connector: "e"
       skip_last_comma: true
     
+  direction: ltr
   date:
     formats:
       default: "%d/%m/%Y"
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 45fdd1eaa..9d4ae1176 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1,4 +1,5 @@
 ro:
+  direction: ltr
   date:
     formats:
       default: "%d-%m-%Y"
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 9d9e5e030..ada2b0f90 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -11,6 +11,7 @@
 # была возможность минимальной локализации приложения на русский язык.
 
 ru:
+  direction: ltr
   date:
     formats:
       default: "%d.%m.%Y"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 0b2351e6b..1ea796f85 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1,4 +1,5 @@
 sk:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index a51cd972e..06fda6424 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1,4 +1,5 @@
 sl:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index bc8a854ad..d290f624a 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -1,6 +1,7 @@
 # Serbian translations for Redmine
 # by Vladimir Medarović (vlada@medarovic.com)
 sr-YU:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 0c022ee9f..e5ef8652e 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1,6 +1,7 @@
 # Serbian translations for Redmine
 # by Vladimir Medarović (vlada@medarovic.com)
 sr:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 42f0bc97a..6e9fa8abc 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -131,6 +131,7 @@ sv:
         not_same_project: "tillhör inte samma projekt"
         circular_dependency: "Denna relation skulle skapa ett cirkulärt beroende"
 
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/th.yml b/config/locales/th.yml
index eaf4cc285..539a5c95a 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1,4 +1,5 @@
 th:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index db4330924..d91cfcfa3 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -5,6 +5,7 @@ tr:
   locale:
     native_name: Türkçe
     address_separator: " "
+  direction: ltr
   date:
     formats:
       default: "%d.%m.%Y"
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 951a546b9..bec1658bb 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1,4 +1,5 @@
 uk:
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index f8ca507bf..1b5d435b7 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -140,6 +140,7 @@ vi:
         not_same_project: "không thuộc cùng dự án"
         circular_dependency: "quan hệ có thể gây ra lặp vô tận"
 
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 5a08041c2..55b54bdcf 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -3,6 +3,7 @@
 # See http://github.com/svenfuchs/rails-i18n/ for details.
 
 "zh-TW":
+  direction: ltr
   date:
     formats:
       # Use the strftime parameters for formats.
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index eeac629a1..ddee00110 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2,6 +2,7 @@
 # by tsechingho (http://github.com/tsechingho)
 
 zh:
+  direction: ltr
   date:
     formats:
       default: "%Y-%m-%d"
diff --git a/public/themes/rtl/stylesheets/application.css b/public/stylesheets/rtl.css
similarity index 76%
rename from public/themes/rtl/stylesheets/application.css
rename to public/stylesheets/rtl.css
index 74f20b43c..913667381 100644
--- a/public/themes/rtl/stylesheets/application.css
+++ b/public/stylesheets/rtl.css
@@ -1,5 +1,3 @@
-@import url(../../alternate/stylesheets/application.css);
-
 body, #wrapper { direction: rtl;}
 
 #quick-search { float: left; }
@@ -20,11 +18,23 @@ body, #wrapper { direction: rtl;}
 	float: right;
 	margin-left: auto;
 }
-.tabular p { clear: right; }
+.tabular p
+{
+	clear: right;
+}
 .tabular label.block { text-align: right; }
-
-.icon { background-position: 100% 40%; padding-right: 20px; padding-left: 0px; }
-div#activity dt, #search-results dt { background-position: 100% 50%; padding-right: 20px; padding-left: 0px; }
+.icon
+{
+       background-position: 100% 40%;
+       padding-right: 20px;
+       padding-left: 0px;
+}
+div#activity dt, #search-results dt
+{
+	background-position: 100% 50%;
+	padding-right: 20px;
+	padding-left: 0px;
+}
 #content .tabs ul li { float: right; }
 #content .tabs ul { padding-left: auto; padding-right: 1em; }
 table.progress { float: right; }
@@ -48,3 +58,9 @@ table.list td.buttons a { padding-right: 20px; }
 div#issue-changesets { float: left; margin-right: 1em; margin-left: 0 }
 #activity dt, .journal { clear: right; }
 .journal-link { float: left; }
+div.wiki pre { direction: ltr; }
+
+#context-menu li.folder ul { left:auto; right:168px; }
+#context-menu li.folder>ul { left:auto; right:148px; }
+
+#context-menu li a.submenu { background:url("../images/bullet_arrow_left.png") left no-repeat; }
diff --git a/public/themes/rtl/stylesheets/context_menu.css b/public/themes/rtl/stylesheets/context_menu.css
deleted file mode 100644
index c400d3e84..000000000
--- a/public/themes/rtl/stylesheets/context_menu.css
+++ /dev/null
@@ -1,6 +0,0 @@
-@import url(../../../stylesheets/context_menu.css);
-
-#context-menu li.folder ul { left:auto; right:168px; }
-#context-menu li.folder>ul { left:auto; right:148px; }
-
-#context-menu li a.submenu { background:url("../../../images/bullet_arrow_left.png") left no-repeat; }