diff --git a/lib/l10n.php b/lib/l10n.php
index 315e326b29232df4d255ec4698db186d8293f00a..7aef653ef79b611a06dbb9fa0e37e9b51fb3b913 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -125,6 +125,15 @@ class OC_L10N{
 				include strip_tags($i18ndir).strip_tags($lang).'.php';
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
 					$this->translations = $TRANSLATIONS;
+					//merge with translations from theme
+                                        $theme = OC_Config::getValue( "theme" );
+                                        if (!is_null($theme)) {
+                                                $transFile = OC::$SERVERROOT.'/themes/'.$theme.substr($transFile, strlen(OC::$SERVERROOT));
+                                                if (file_exists($transFile)) {
+                                                        include $transFile;
+                                                        $this->translations = array_merge($this->translations, $TRANSLATIONS);
+                                                }
+                                        }
 				}
 			}