Merge branch 'master' into calendar_dropimport

18 files changed, 25 insertions, 8 deletions

diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index 37dc6380198..37dc6380198 100755..100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php
index 3122c7e6754..3122c7e6754 100755..100644
--- a/apps/media/ajax/autoupdate.php
+++ b/apps/media/ajax/autoupdate.php
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index 26cb2045549..26cb2045549 100755..100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
diff --git a/apps/media/index.php b/apps/media/index.php
index 906d7bacb6e..906d7bacb6e 100755..100644
--- a/apps/media/index.php
+++ b/apps/media/index.php
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index 0b5a9ef9a47..03d577c7c98 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -112,7 +112,7 @@ Collection={
 							Collection.parent.find('tr').removeClass('active');
 							$('tr[data-artist="'+artist.name+'"]').addClass('active');
 						});
-						expander='';
+						var expander='';
 						if(artist.songs.length>1){
 							expander=$('<a class="expander">&gt;</a>');
 							expander.data('expanded',false);
diff --git a/apps/media/l10n/eo.php b/apps/media/l10n/eo.php
index a572c15cb4c..429247bbc33 100644
--- a/apps/media/l10n/eo.php
+++ b/apps/media/l10n/eo.php
@@ -1,13 +1,13 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Muziko",
 "Play" => "Ludi",
-"Pause" => "Paŭzi",
-"Previous" => "Maljena",
-"Next" => "Jena",
+"Pause" => "Paŭzigi",
+"Previous" => "Antaŭa",
+"Next" => "Sekva",
 "Mute" => "Silentigi",
 "Unmute" => "Malsilentigi",
 "Rescan Collection" => "Reskani la aron",
-"Artist" => "Verkinto",
+"Artist" => "Artisto",
 "Album" => "Albumo",
 "Title" => "Titolo"
 );
diff --git a/apps/media/l10n/es.php b/apps/media/l10n/es.php
index 8d654fd36cd..100ab6a7a73 100644
--- a/apps/media/l10n/es.php
+++ b/apps/media/l10n/es.php
@@ -5,8 +5,8 @@
 "Previous" => "Anterior",
 "Next" => "Siguiente",
 "Mute" => "Silenciar",
-"Unmute" => "Sonar",
-"Rescan Collection" => "Buscar música nueva",
+"Unmute" => "Quitar silencio",
+"Rescan Collection" => "Buscar canciones nuevas",
 "Artist" => "Artista",
 "Album" => "Álbum",
 "Title" => "Título"
diff --git a/apps/media/l10n/fa.php b/apps/media/l10n/fa.php
new file mode 100644
index 00000000000..3bccdb0c509
--- /dev/null
+++ b/apps/media/l10n/fa.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "موسیقی",
+"Play" => "پخش کردن",
+"Pause" => "توقف کوتاه",
+"Previous" => "قبلی",
+"Next" => "بعدی",
+"Mute" => "خفه کردن",
+"Unmute" => "باز گشایی صدا",
+"Rescan Collection" => "دوباره بازرسی مجموعه ها",
+"Artist" => "هنرمند",
+"Album" => "آلبوم",
+"Title" => "عنوان"
+);
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index f5c91661abe..f5c91661abe 100755..100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index a32a50534ed..a32a50534ed 100755..100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 71069fdf4b9..71069fdf4b9 100755..100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index dc2a8a9beb4..dc2a8a9beb4 100755..100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
diff --git a/apps/media/remote.php b/apps/media/remote.php
index 8a88c2b51ae..01add42b315 100644
--- a/apps/media/remote.php
+++ b/apps/media/remote.php
@@ -1,7 +1,11 @@
 <?php
+
+// only need filesystem apps
+$RUNTIME_APPTYPES=array('filesystem','authentication');
+OC_App::loadApps($RUNTIME_APPTYPES);
+
 if($path_info == '/ampache' || $path_info == '/ampache/'){
 	require_once(OC::$APPSROOT . '/apps/media/index.php');
 }else{
 	require_once(OC::$APPSROOT . '/apps/media/server/xml.server.php');
 }
-?>
\ No newline at end of file
diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php
index 6cb6c91ca06..6cb6c91ca06 100755..100644
--- a/apps/media/server/xml.server.php
+++ b/apps/media/server/xml.server.php
diff --git a/apps/media/settings.php b/apps/media/settings.php
index 227298fafec..227298fafec 100755..100644
--- a/apps/media/settings.php
+++ b/apps/media/settings.php
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index 589d6b52475..589d6b52475 100755..100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php
index 6c14006f831..6c14006f831 100755..100644
--- a/apps/media/templates/player.php
+++ b/apps/media/templates/player.php
diff --git a/apps/media/templates/settings.php b/apps/media/templates/settings.php
index a7dc0775c44..a7dc0775c44 100755..100644
--- a/apps/media/templates/settings.php
+++ b/apps/media/templates/settings.php