Correct merge issues in the last merge from master

[rails.git] / config / locales / ar.yml

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index fb3742c6cfe83f185e69aaff993672f62db93c66..8a012517577a5e5591e970cfc4f0f646dd313e75 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -3,6 +3,7 @@
 # Export driver: syck
 # Author: Aude
 # Author: Bassem JARKAS
+# Author: Grille chompa
 # Author: Mutarjem horr
 # Author: OsamaK
 ar: 
@@ -859,6 +860,8 @@ ar:
           water_point: نقطة ماء شفة
           waterfall: شلال
           weir: هدار (سدّ منخفض)
+  html: 
+    dir: rtl
   javascripts: 
     map: 
       base: