Merge branch 'master' into convert-oc_config

Conflicts:
	lib/config.php

67 files changed, 146 insertions, 27 deletions

diff --git a/lib/base.php b/lib/base.php
index af54f439155..d1279a46337 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -173,11 +173,12 @@ class OC {
 	public static function checkConfig() {
 		if (file_exists(OC::$SERVERROOT . "/config/config.php")
 			and !is_writable(OC::$SERVERROOT . "/config/config.php")) {
+			$defaults = new OC_Defaults();
 			$tmpl = new OC_Template('', 'error', 'guest');
 			$tmpl->assign('errors', array(1 => array(
 				'error' => "Can't write into config directory 'config'",
-				'hint' => 'You can usually fix this by giving the webserver user write access'
-					.' to the config directory in owncloud'
+				'hint' => 'This can usually be fixed by '
+					.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.'
 			)));
 			$tmpl->printPage();
 			exit();
diff --git a/lib/config.php b/lib/config.php
index afd74c56b40..c01cb4e152f 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -156,6 +156,7 @@ class Config {
 	 */
 	private function writeData() {
 		// Create a php file ...
+		$defaults = new OC_Defaults;
 		$content = "<?php\n";
 		if ($this->debugMode) {
 			$content .= "define('DEBUG',true);\n";
@@ -167,10 +168,11 @@ class Config {
 		// Write the file
 		$result = @file_put_contents($this->configFilename, $content);
 		if (!$result) {
+			$url = $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions';
 			throw new HintException(
 				"Can't write into config directory 'config'",
-				'You can usually fix this by giving the webserver user write access'
-					.' to the config directory in ownCloud');
+				'This can usually be fixed by '
+					.'<a href="' . $url . '" target="_blank">giving the webserver write access to the config directory</a>.');
 		}
 		// Prevent others not to read the config
 		@chmod($this->configFilename, 0640);
diff --git a/lib/db.php b/lib/db.php
index a93b9eccbdf..6fec60e53ce 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -681,7 +681,7 @@ class OC_DB {
 	 * @brief Insert a row if a matching row doesn't exists.
 	 * @param string $table. The table to insert into in the form '*PREFIX*tableName'
 	 * @param array $input. An array of fieldname/value pairs
-	 * @returns The return value from PDOStatementWrapper->execute()
+	 * @returns int number of updated rows
 	 */
 	public static function insertIfNotExist($table, $input) {
 		self::connect();
@@ -715,7 +715,7 @@ class OC_DB {
 					. implode('`,`', array_keys($input)) . '`) VALUES('
 					. str_repeat('?,', count($input)-1).'? ' . ')';
 			} else {
-				return true;
+				return 0; //no rows updated
 			}
 		} elseif( $type == 'pgsql' || $type == 'oci' || $type == 'mysql' || $type == 'mssql') {
 			$query = 'INSERT INTO `' .$table . '` (`'
@@ -736,9 +736,6 @@ class OC_DB {
 		} catch(PDOException $e) {
 			OC_Template::printExceptionErrorPage( $e );
 		}
-		if ($result === 0) {
-			return true;
-		}
 
 		return $result;
 	}
@@ -1036,7 +1033,7 @@ class PDOStatementWrapper{
 	}
 
 	/**
-	 * make execute return the result instead of a bool
+	 * make execute return the result or updated row count instead of a bool
 	 */
 	public function execute($input=array()) {
 		if(OC_Config::getValue( "log_query", false)) {
diff --git a/lib/l10n/af_ZA.php b/lib/l10n/af_ZA.php
index 38e91288fbe..de32778026f 100644
--- a/lib/l10n/af_ZA.php
+++ b/lib/l10n/af_ZA.php
@@ -4,5 +4,6 @@
 "Settings" => "Instellings",
 "Users" => "Gebruikers",
 "Apps" => "Toepassings",
-"Admin" => "Admin"
+"Admin" => "Admin",
+"web services under your control" => "webdienste onder jou beheer"
 );
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
index 35a86d0b9d3..107b27a1fc8 100644
--- a/lib/l10n/ar.php
+++ b/lib/l10n/ar.php
@@ -5,6 +5,7 @@
 "Users" => "المستخدمين",
 "Apps" => "التطبيقات",
 "Admin" => "المدير",
+"web services under your control" => "خدمات الشبكة تحت سيطرتك",
 "ZIP download is turned off." => "تحميل ملفات ZIP متوقف",
 "Files need to be downloaded one by one." => "الملفات بحاجة الى ان يتم تحميلها واحد تلو الاخر",
 "Back to Files" => "العودة الى الملفات",
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index 4ca307e3c13..e23112c8302 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -5,6 +5,7 @@
 "Users" => "Потребители",
 "Apps" => "Приложения",
 "Admin" => "Админ",
+"web services under your control" => "уеб услуги под Ваш контрол",
 "ZIP download is turned off." => "Изтеглянето като ZIP е изключено.",
 "Files need to be downloaded one by one." => "Файловете трябва да се изтеглят един по един.",
 "Back to Files" => "Назад към файловете",
diff --git a/lib/l10n/bn_BD.php b/lib/l10n/bn_BD.php
index f7c8f57466d..ab1d9b94d0d 100644
--- a/lib/l10n/bn_BD.php
+++ b/lib/l10n/bn_BD.php
@@ -5,6 +5,7 @@
 "Users" => "ব্যবহারকারী",
 "Apps" => "অ্যাপ",
 "Admin" => "প্রশাসন",
+"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
 "ZIP download is turned off." => "ZIP ডাউনলোড বন্ধ করা আছে।",
 "Files need to be downloaded one by one." => "ফাইলগুলো একে একে ডাউনলোড করা আবশ্যক।",
 "Back to Files" => "ফাইলে ফিরে চল",
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 0dd7c86b26c..93f7fa5f7bc 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -5,6 +5,7 @@
 "Users" => "Usuaris",
 "Apps" => "Aplicacions",
 "Admin" => "Administració",
+"web services under your control" => "controleu els vostres serveis web",
 "ZIP download is turned off." => "La baixada en ZIP està desactivada.",
 "Files need to be downloaded one by one." => "Els fitxers s'han de baixar d'un en un.",
 "Back to Files" => "Torna a Fitxers",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 7e5275f4b6c..917f383bb89 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -5,6 +5,7 @@
 "Users" => "Uživatelé",
 "Apps" => "Aplikace",
 "Admin" => "Administrace",
+"web services under your control" => "služby webu pod Vaší kontrolou",
 "ZIP download is turned off." => "Stahování ZIPu je vypnuto.",
 "Files need to be downloaded one by one." => "Soubory musí být stahovány jednotlivě.",
 "Back to Files" => "Zpět k souborům",
diff --git a/lib/l10n/cy_GB.php b/lib/l10n/cy_GB.php
index 37d49a77bdd..27140ba6dbb 100644
--- a/lib/l10n/cy_GB.php
+++ b/lib/l10n/cy_GB.php
@@ -5,6 +5,7 @@
 "Users" => "Defnyddwyr",
 "Apps" => "Pecynnau",
 "Admin" => "Gweinyddu",
+"web services under your control" => "gwasanaethau gwe a reolir gennych",
 "ZIP download is turned off." => "Mae llwytho ZIP wedi ei ddiffodd.",
 "Files need to be downloaded one by one." => "Mae angen llwytho ffeiliau i lawr fesul un.",
 "Back to Files" => "Nôl i Ffeiliau",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index e5df63eef91..5f11453bcdd 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -5,6 +5,7 @@
 "Users" => "Brugere",
 "Apps" => "Apps",
 "Admin" => "Admin",
+"web services under your control" => "Webtjenester under din kontrol",
 "ZIP download is turned off." => "ZIP-download er slået fra.",
 "Files need to be downloaded one by one." => "Filer skal downloades en for en.",
 "Back to Files" => "Tilbage til Filer",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index bd7c4070243..4ef02402b9b 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -5,6 +5,7 @@
 "Users" => "Benutzer",
 "Apps" => "Apps",
 "Admin" => "Administration",
+"web services under your control" => "Web-Services unter Deiner Kontrolle",
 "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
 "Back to Files" => "Zurück zu \"Dateien\"",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 651c63fb771..823d423abcd 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -5,6 +5,7 @@
 "Users" => "Benutzer",
 "Apps" => "Apps",
 "Admin" => "Administrator",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "ZIP download is turned off." => "Der ZIP-Download ist deaktiviert.",
 "Files need to be downloaded one by one." => "Die Dateien müssen einzeln heruntergeladen werden.",
 "Back to Files" => "Zurück zu \"Dateien\"",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 09dac78edf0..3e876aefdfe 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -5,6 +5,7 @@
 "Users" => "Χρήστες",
 "Apps" => "Εφαρμογές",
 "Admin" => "Διαχειριστής",
+"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
 "ZIP download is turned off." => "Η λήψη ZIP απενεργοποιήθηκε.",
 "Files need to be downloaded one by one." => "Τα αρχεία πρέπει να ληφθούν ένα-ένα.",
 "Back to Files" => "Πίσω στα Αρχεία",
diff --git a/lib/l10n/en@pirate.php b/lib/l10n/en@pirate.php
new file mode 100644
index 00000000000..02ff0331e05
--- /dev/null
+++ b/lib/l10n/en@pirate.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"web services under your control" => "web services under your control"
+);
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index b24748b0db1..fd45f30c69b 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -5,6 +5,7 @@
 "Users" => "Uzantoj",
 "Apps" => "Aplikaĵoj",
 "Admin" => "Administranto",
+"web services under your control" => "TTT-servoj regataj de vi",
 "ZIP download is turned off." => "ZIP-elŝuto estas malkapabligita.",
 "Files need to be downloaded one by one." => "Dosieroj devas elŝutiĝi unuope.",
 "Back to Files" => "Reen al la dosieroj",
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 83bc7b1ed8c..1f243a224e4 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -5,6 +5,7 @@
 "Users" => "Usuarios",
 "Apps" => "Aplicaciones",
 "Admin" => "Administración",
+"web services under your control" => "Servicios web bajo su control",
 "ZIP download is turned off." => "La descarga en ZIP está desactivada.",
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados uno por uno.",
 "Back to Files" => "Volver a Archivos",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index 121caf89be9..e66771f7e74 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -5,6 +5,7 @@
 "Users" => "Usuarios",
 "Apps" => "Aplicaciones",
 "Admin" => "Administración",
+"web services under your control" => "servicios web que controlás",
 "ZIP download is turned off." => "La descarga en ZIP está desactivada.",
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados de a uno.",
 "Back to Files" => "Volver a archivos",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 3db0cda0c76..4da2c36d6ac 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -5,6 +5,7 @@
 "Users" => "Kasutajad",
 "Apps" => "Rakendused",
 "Admin" => "Admin",
+"web services under your control" => "veebitenused sinu kontrolli all",
 "ZIP download is turned off." => "ZIP-ina allalaadimine on välja lülitatud.",
 "Files need to be downloaded one by one." => "Failid tuleb alla laadida ükshaaval.",
 "Back to Files" => "Tagasi failide juurde",
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index cfb09681ae7..028ad0a631e 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -5,6 +5,7 @@
 "Users" => "Erabiltzaileak",
 "Apps" => "Aplikazioak",
 "Admin" => "Admin",
+"web services under your control" => "web zerbitzuak zure kontrolpean",
 "ZIP download is turned off." => "ZIP deskarga ez dago gaituta.",
 "Files need to be downloaded one by one." => "Fitxategiak banan-banan deskargatu behar dira.",
 "Back to Files" => "Itzuli fitxategietara",
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index b0d423421df..a74188f6283 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -5,15 +5,34 @@
 "Users" => "کاربران",
 "Apps" => "  برنامه ها",
 "Admin" => "مدیر",
+"web services under your control" => "سرویس های تحت وب در کنترل شما",
 "ZIP download is turned off." => "دانلود به صورت فشرده غیر فعال است",
 "Files need to be downloaded one by one." => "فایل ها باید به صورت یکی یکی دانلود شوند",
 "Back to Files" => "بازگشت به فایل ها",
 "Selected files too large to generate zip file." => "فایل های انتخاب شده بزرگتر از آن هستند که بتوان یک فایل فشرده تولید کرد",
+"couldn't be determined" => "نمیتواند مشخص شود",
 "Application is not enabled" => "برنامه فعال نشده است",
 "Authentication error" => "خطا در اعتبار سنجی",
+"Token expired. Please reload page." => "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید.",
 "Files" => "پرونده‌ها",
 "Text" => "متن",
 "Images" => "تصاویر",
+"%s enter the database username." => "%s نام کاربری پایگاه داده را وارد نمایید.",
+"%s enter the database name." => "%s نام پایگاه داده را وارد نمایید.",
+"%s you may not use dots in the database name" => "%s شما نباید از نقطه در نام پایگاه داده استفاده نمایید.",
+"MS SQL username and/or password not valid: %s" => "نام کاربری و / یا رمزعبور MS SQL معتبر نیست:  %s",
+"You need to enter either an existing account or the administrator." => "شما نیاز به وارد کردن یک حساب کاربری موجود یا حساب مدیریتی دارید.",
+"MySQL username and/or password not valid" => "نام کاربری و / یا رمزعبور MySQL  معتبر نیست.",
+"DB Error: \"%s\"" => "خطای پایگاه داده: \"%s\"",
+"MySQL user '%s'@'localhost' exists already." => "کاربرMySQL '%s'@'localhost' درحال حاضر موجود است.",
+"Drop this user from MySQL" => "این کاربر را از MySQL حذف نمایید.",
+"MySQL user '%s'@'%%' already exists" => "کاربر'%s'@'%%'  MySQL  در حال حاضر موجود است.",
+"Drop this user from MySQL." => "این کاربر را از MySQL حذف نمایید.",
+"Oracle connection could not be established" => "ارتباط اراکل نمیتواند برقرار باشد.",
+"Oracle username and/or password not valid" => "نام کاربری و / یا رمزعبور اراکل معتبر نیست.",
+"PostgreSQL username and/or password not valid" => "PostgreSQL نام کاربری و / یا رمزعبور معتبر نیست.",
+"Set an admin username." => "یک نام کاربری برای مدیر تنظیم نمایید.",
+"Set an admin password." => "یک رمزعبور برای مدیر تنظیم نمایید.",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "احتمالاً وب سرور شما طوری تنظیم نشده است که اجازه ی همگام سازی فایلها را بدهد زیرا به نظر میرسد رابط WebDAV از کار افتاده است.",
 "Please double check the <a href='%s'>installation guides</a>." => "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
 "seconds ago" => "ثانیه‌ها پیش",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 8726951f838..75576c3034d 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -5,6 +5,7 @@
 "Users" => "Käyttäjät",
 "Apps" => "Sovellukset",
 "Admin" => "Ylläpitäjä",
+"web services under your control" => "verkkopalvelut hallinnassasi",
 "ZIP download is turned off." => "ZIP-lataus on poistettu käytöstä.",
 "Files need to be downloaded one by one." => "Tiedostot on ladattava yksittäin.",
 "Back to Files" => "Takaisin tiedostoihin",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 724c69420b9..9f30b602696 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -5,6 +5,7 @@
 "Users" => "Utilisateurs",
 "Apps" => "Applications",
 "Admin" => "Administration",
+"web services under your control" => "services web sous votre contrôle",
 "ZIP download is turned off." => "Téléchargement ZIP désactivé.",
 "Files need to be downloaded one by one." => "Les fichiers nécessitent d'être téléchargés un par un.",
 "Back to Files" => "Retour aux Fichiers",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index f0d01e4a7df..351f18c7155 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -5,6 +5,7 @@
 "Users" => "Usuarios",
 "Apps" => "Aplicativos",
 "Admin" => "Administración",
+"web services under your control" => "servizos web baixo o seu control",
 "ZIP download is turned off." => "As descargas ZIP están desactivadas.",
 "Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados dun en un.",
 "Back to Files" => "Volver aos ficheiros",
diff --git a/lib/l10n/he.php b/lib/l10n/he.php
index 0069d77eee4..2e011e342a0 100644
--- a/lib/l10n/he.php
+++ b/lib/l10n/he.php
@@ -5,6 +5,7 @@
 "Users" => "משתמשים",
 "Apps" => "יישומים",
 "Admin" => "מנהל",
+"web services under your control" => "שירותי רשת תחת השליטה שלך",
 "ZIP download is turned off." => "הורדת ZIP כבויה",
 "Files need to be downloaded one by one." => "יש להוריד את הקבצים אחד אחרי השני.",
 "Back to Files" => "חזרה לקבצים",
diff --git a/lib/l10n/hr.php b/lib/l10n/hr.php
index 3ce75c99f0e..41c34d3108c 100644
--- a/lib/l10n/hr.php
+++ b/lib/l10n/hr.php
@@ -5,6 +5,7 @@
 "Users" => "Korisnici",
 "Apps" => "Aplikacije",
 "Admin" => "Administrator",
+"web services under your control" => "web usluge pod vašom kontrolom",
 "Authentication error" => "Greška kod autorizacije",
 "Files" => "Datoteke",
 "Text" => "Tekst",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index beca4a12562..3aa04274fa3 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -5,6 +5,7 @@
 "Users" => "Felhasználók",
 "Apps" => "Alkalmazások",
 "Admin" => "Adminsztráció",
+"web services under your control" => "webszolgáltatások saját kézben",
 "ZIP download is turned off." => "A ZIP-letöltés nincs engedélyezve.",
 "Files need to be downloaded one by one." => "A fájlokat egyenként kell letölteni.",
 "Back to Files" => "Vissza a Fájlokhoz",
diff --git a/lib/l10n/ia.php b/lib/l10n/ia.php
index 573281553fc..e5f6e3ddf58 100644
--- a/lib/l10n/ia.php
+++ b/lib/l10n/ia.php
@@ -5,6 +5,7 @@
 "Users" => "Usatores",
 "Apps" => "Applicationes",
 "Admin" => "Administration",
+"web services under your control" => "servicios web sub tu controlo",
 "Files" => "Files",
 "Text" => "Texto"
 );
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index 8f72f24ea61..c247651f0c9 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -5,6 +5,7 @@
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
+"web services under your control" => "layanan web dalam kontrol Anda",
 "ZIP download is turned off." => "Pengunduhan ZIP dimatikan.",
 "Files need to be downloaded one by one." => "Berkas harus diunduh satu persatu.",
 "Back to Files" => "Kembali ke Daftar Berkas",
diff --git a/lib/l10n/is.php b/lib/l10n/is.php
index 05bb6883953..0f7a22fd13e 100644
--- a/lib/l10n/is.php
+++ b/lib/l10n/is.php
@@ -5,6 +5,7 @@
 "Users" => "Notendur",
 "Apps" => "Forrit",
 "Admin" => "Stjórnun",
+"web services under your control" => "vefþjónusta undir þinni stjórn",
 "ZIP download is turned off." => "Slökkt á ZIP niðurhali.",
 "Files need to be downloaded one by one." => "Skrárnar verður að sækja eina og eina",
 "Back to Files" => "Aftur í skrár",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 92a3d201d3a..74483315ca0 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -5,6 +5,7 @@
 "Users" => "Utenti",
 "Apps" => "Applicazioni",
 "Admin" => "Admin",
+"web services under your control" => "servizi web nelle tue mani",
 "ZIP download is turned off." => "Lo scaricamento in formato ZIP è stato disabilitato.",
 "Files need to be downloaded one by one." => "I file devono essere scaricati uno alla volta.",
 "Back to Files" => "Torna ai file",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 804c0441da0..36d06d360b9 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -5,6 +5,7 @@
 "Users" => "ユーザ",
 "Apps" => "アプリ",
 "Admin" => "管理",
+"web services under your control" => "管理下のウェブサービス",
 "ZIP download is turned off." => "ZIPダウンロードは無効です。",
 "Files need to be downloaded one by one." => "ファイルは1つずつダウンロードする必要があります。",
 "Back to Files" => "ファイルに戻る",
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index d2bb3ea2b0d..c6e77da2dac 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -5,6 +5,7 @@
 "Users" => "მომხმარებელი",
 "Apps" => "აპლიკაციები",
 "Admin" => "ადმინისტრატორი",
+"web services under your control" => "web services under your control",
 "ZIP download is turned off." => "ZIP download–ი გათიშულია",
 "Files need to be downloaded one by one." => "ფაილები უნდა გადმოიტვირთოს სათითაოდ.",
 "Back to Files" => "უკან ფაილებში",
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
index bfb99544a3b..31245ea96f2 100644
--- a/lib/l10n/ko.php
+++ b/lib/l10n/ko.php
@@ -5,6 +5,7 @@
 "Users" => "사용자",
 "Apps" => "앱",
 "Admin" => "관리자",
+"web services under your control" => "내가 관리하는 웹 서비스",
 "ZIP download is turned off." => "ZIP 다운로드가 비활성화되었습니다.",
 "Files need to be downloaded one by one." => "파일을 개별적으로 다운로드해야 합니다.",
 "Back to Files" => "파일로 돌아가기",
diff --git a/lib/l10n/ku_IQ.php b/lib/l10n/ku_IQ.php
index 20d0249f569..6d7461a1685 100644
--- a/lib/l10n/ku_IQ.php
+++ b/lib/l10n/ku_IQ.php
@@ -3,5 +3,6 @@
 "Settings" => "ده‌ستكاری",
 "Users" => "به‌كارهێنه‌ر",
 "Apps" => "به‌رنامه‌كان",
-"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی"
+"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
+"web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
 );
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index 889fc3a377d..867b0a37409 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -3,12 +3,17 @@
 "Personal" => "Perséinlech",
 "Settings" => "Astellungen",
 "Users" => "Benotzer",
-"Apps" => "Applicatiounen",
+"Apps" => "Applikatiounen",
 "Admin" => "Admin",
+"web services under your control" => "Web-Servicer ënnert denger Kontroll",
 "Authentication error" => "Authentifikatioun's Fehler",
 "Files" => "Dateien",
 "Text" => "SMS",
+"seconds ago" => "Sekonnen hir",
+"1 minute ago" => "1 Minutt hir",
 "1 hour ago" => "vrun 1 Stonn",
+"today" => "haut",
+"yesterday" => "gëschter",
 "last month" => "Läschte Mount",
 "last year" => "Läscht Joer",
 "years ago" => "Joren hier"
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index b8268ed4376..5e3a0482033 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -5,6 +5,7 @@
 "Users" => "Vartotojai",
 "Apps" => "Programos",
 "Admin" => "Administravimas",
+"web services under your control" => "jūsų valdomos web paslaugos",
 "ZIP download is turned off." => "ZIP atsisiuntimo galimybė yra išjungta.",
 "Files need to be downloaded one by one." => "Failai turi būti parsiunčiami vienas po kito.",
 "Back to Files" => "Atgal į Failus",
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
index 3fade1ab201..662f4d5b245 100644
--- a/lib/l10n/lv.php
+++ b/lib/l10n/lv.php
@@ -5,6 +5,7 @@
 "Users" => "Lietotāji",
 "Apps" => "Lietotnes",
 "Admin" => "Administratori",
+"web services under your control" => "tīmekļa servisi tavā varā",
 "ZIP download is turned off." => "ZIP lejupielādēšana ir izslēgta.",
 "Files need to be downloaded one by one." => "Datnes var lejupielādēt tikai katru atsevišķi.",
 "Back to Files" => "Atpakaļ pie datnēm",
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
index 34790c93745..30fa9ab73c1 100644
--- a/lib/l10n/mk.php
+++ b/lib/l10n/mk.php
@@ -5,6 +5,7 @@
 "Users" => "Корисници",
 "Apps" => "Аппликации",
 "Admin" => "Админ",
+"web services under your control" => "веб сервиси под Ваша контрола",
 "ZIP download is turned off." => "Преземање во ZIP е исклучено",
 "Files need to be downloaded one by one." => "Датотеките треба да се симнат една по една.",
 "Back to Files" => "Назад кон датотеки",
diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php
index 6abbbe86e80..a2930597971 100644
--- a/lib/l10n/ms_MY.php
+++ b/lib/l10n/ms_MY.php
@@ -5,6 +5,7 @@
 "Users" => "Pengguna",
 "Apps" => "Aplikasi",
 "Admin" => "Admin",
+"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Authentication error" => "Ralat pengesahan",
 "Files" => "Fail-fail",
 "Text" => "Teks"
diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php
index 5d1812fd742..f214a1ed794 100644
--- a/lib/l10n/my_MM.php
+++ b/lib/l10n/my_MM.php
@@ -3,6 +3,7 @@
 "Users" => "သုံးစွဲသူ",
 "Apps" => "Apps",
 "Admin" => "အက်ဒမင်",
+"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
 "ZIP download is turned off." => "ZIP ဒေါင်းလုတ်ကိုပိတ်ထားသည်",
 "Files need to be downloaded one by one." => "ဖိုင်များသည် တစ်ခုပြီး တစ်ခုဒေါင်းလုတ်ချရန်လိုအပ်သည်",
 "Back to Files" => "ဖိုင်သို့ပြန်သွားမည်",
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index 23146154c77..ab2d4f91920 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -5,6 +5,7 @@
 "Users" => "Brukere",
 "Apps" => "Apper",
 "Admin" => "Admin",
+"web services under your control" => "web tjenester du kontrollerer",
 "ZIP download is turned off." => "ZIP-nedlasting av avslått",
 "Files need to be downloaded one by one." => "Filene må lastes ned en om gangen",
 "Back to Files" => "Tilbake til filer",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index e1c26273600..de80d1b5d56 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -5,6 +5,7 @@
 "Users" => "Gebruikers",
 "Apps" => "Apps",
 "Admin" => "Beheerder",
+"web services under your control" => "Webdiensten in eigen beheer",
 "ZIP download is turned off." => "ZIP download is uitgeschakeld.",
 "Files need to be downloaded one by one." => "Bestanden moeten één voor één worden gedownload.",
 "Back to Files" => "Terug naar bestanden",
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
index 8241573f9ae..c1739398109 100644
--- a/lib/l10n/nn_NO.php
+++ b/lib/l10n/nn_NO.php
@@ -5,6 +5,7 @@
 "Users" => "Brukarar",
 "Apps" => "Program",
 "Admin" => "Administrer",
+"web services under your control" => "Vev tjenester under din kontroll",
 "Authentication error" => "Feil i autentisering",
 "Files" => "Filer",
 "Text" => "Tekst",
diff --git a/lib/l10n/oc.php b/lib/l10n/oc.php
index 85e2a27b431..a72da90790a 100644
--- a/lib/l10n/oc.php
+++ b/lib/l10n/oc.php
@@ -5,6 +5,7 @@
 "Users" => "Usancièrs",
 "Apps" => "Apps",
 "Admin" => "Admin",
+"web services under your control" => "Services web jos ton contraròtle",
 "ZIP download is turned off." => "Avalcargar los ZIP es inactiu.",
 "Files need to be downloaded one by one." => "Los fichièrs devan èsser avalcargats un per un.",
 "Back to Files" => "Torna cap als fichièrs",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 92600785f84..bbca1913b70 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -5,6 +5,7 @@
 "Users" => "Użytkownicy",
 "Apps" => "Aplikacje",
 "Admin" => "Administrator",
+"web services under your control" => "Kontrolowane serwisy",
 "ZIP download is turned off." => "Pobieranie ZIP jest wyłączone.",
 "Files need to be downloaded one by one." => "Pliki muszą zostać pobrane pojedynczo.",
 "Back to Files" => "Wróć do plików",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 8b29f1510c6..029331fdec8 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -5,6 +5,7 @@
 "Users" => "Usuários",
 "Apps" => "Aplicações",
 "Admin" => "Admin",
+"web services under your control" => "serviços web sob seu controle",
 "ZIP download is turned off." => "Download ZIP está desligado.",
 "Files need to be downloaded one by one." => "Arquivos precisam ser baixados um de cada vez.",
 "Back to Files" => "Voltar para Arquivos",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 75824612ab0..7480026e920 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -5,6 +5,7 @@
 "Users" => "Utilizadores",
 "Apps" => "Aplicações",
 "Admin" => "Admin",
+"web services under your control" => "serviços web sob o seu controlo",
 "ZIP download is turned off." => "Descarregamento em ZIP está desligado.",
 "Files need to be downloaded one by one." => "Os ficheiros precisam de ser descarregados um por um.",
 "Back to Files" => "Voltar a Ficheiros",
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 6661caf86e7..5a34e9571e5 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -5,6 +5,7 @@
 "Users" => "Utilizatori",
 "Apps" => "Aplicații",
 "Admin" => "Admin",
+"web services under your control" => "servicii web controlate de tine",
 "ZIP download is turned off." => "Descărcarea ZIP este dezactivată.",
 "Files need to be downloaded one by one." => "Fișierele trebuie descărcate unul câte unul.",
 "Back to Files" => "Înapoi la fișiere",
@@ -16,6 +17,8 @@
 "Files" => "Fișiere",
 "Text" => "Text",
 "Images" => "Imagini",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
+"Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</ a>.",
 "seconds ago" => "secunde în urmă",
 "1 minute ago" => "1 minut în urmă",
 "%d minutes ago" => "%d minute în urmă",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 1753c549801..052b0487c6c 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -5,6 +5,7 @@
 "Users" => "Пользователи",
 "Apps" => "Приложения",
 "Admin" => "Admin",
+"web services under your control" => "веб-сервисы под вашим управлением",
 "ZIP download is turned off." => "ZIP-скачивание отключено.",
 "Files need to be downloaded one by one." => "Файлы должны быть загружены по одному.",
 "Back to Files" => "Назад к файлам",
diff --git a/lib/l10n/si_LK.php b/lib/l10n/si_LK.php
index 4846fdcc066..49ded7026e0 100644
--- a/lib/l10n/si_LK.php
+++ b/lib/l10n/si_LK.php
@@ -5,6 +5,7 @@
 "Users" => "පරිශීලකයන්",
 "Apps" => "යෙදුම්",
 "Admin" => "පරිපාලක",
+"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
 "ZIP download is turned off." => "ZIP භාගත කිරීම් අක්‍රියයි",
 "Files need to be downloaded one by one." => "ගොනු එකින් එක භාගත යුතුයි",
 "Back to Files" => "ගොනු වෙතට නැවත යන්න",
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index 064484cc53f..64ad1e540f3 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -5,6 +5,7 @@
 "Users" => "Používatelia",
 "Apps" => "Aplikácie",
 "Admin" => "Administrátor",
+"web services under your control" => "webové služby pod Vašou kontrolou",
 "ZIP download is turned off." => "Sťahovanie súborov ZIP je vypnuté.",
 "Files need to be downloaded one by one." => "Súbory musia byť nahrávané jeden za druhým.",
 "Back to Files" => "Späť na súbory",
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 5b96b612671..a5b4decd61a 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -5,6 +5,7 @@
 "Users" => "Uporabniki",
 "Apps" => "Programi",
 "Admin" => "Skrbništvo",
+"web services under your control" => "spletne storitve pod vašim nadzorom",
 "ZIP download is turned off." => "Prejemanje datotek v paketu ZIP je onemogočeno.",
 "Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamično.",
 "Back to Files" => "Nazaj na datoteke",
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
index 25b9f0c55c4..df5e2a31743 100644
--- a/lib/l10n/sq.php
+++ b/lib/l10n/sq.php
@@ -5,6 +5,7 @@
 "Users" => "Përdoruesit",
 "Apps" => "App",
 "Admin" => "Admin",
+"web services under your control" => "shërbime web nën kontrollin tënd",
 "ZIP download is turned off." => "Shkarimi i skedarëve ZIP është i çaktivizuar.",
 "Files need to be downloaded one by one." => "Skedarët duhet të shkarkohen një nga një.",
 "Back to Files" => "Kthehu tek skedarët",
diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php
index 45b8e06200c..71d627e7890 100644
--- a/lib/l10n/sr.php
+++ b/lib/l10n/sr.php
@@ -5,6 +5,7 @@
 "Users" => "Корисници",
 "Apps" => "Апликације",
 "Admin" => "Администратор",
+"web services under your control" => "веб сервиси под контролом",
 "ZIP download is turned off." => "Преузимање ZIP-а је искључено.",
 "Files need to be downloaded one by one." => "Датотеке морате преузимати једну по једну.",
 "Back to Files" => "Назад на датотеке",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 7b024c4b49f..56776e574aa 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -5,6 +5,7 @@
 "Users" => "Användare",
 "Apps" => "Program",
 "Admin" => "Admin",
+"web services under your control" => "webbtjänster under din kontroll",
 "ZIP download is turned off." => "Nerladdning av ZIP är avstängd.",
 "Files need to be downloaded one by one." => "Filer laddas ner en åt gången.",
 "Back to Files" => "Tillbaka till Filer",
diff --git a/lib/l10n/ta_LK.php b/lib/l10n/ta_LK.php
index c9bb578b40f..9193f6f1d2f 100644
--- a/lib/l10n/ta_LK.php
+++ b/lib/l10n/ta_LK.php
@@ -5,6 +5,7 @@
 "Users" => "பயனாளர்",
 "Apps" => "செயலிகள்",
 "Admin" => "நிர்வாகம்",
+"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
 "ZIP download is turned off." => "வீசொலிப் பூட்டு பதிவிறக்கம் நிறுத்தப்பட்டுள்ளது.",
 "Files need to be downloaded one by one." => "கோப்புகள்ஒன்றன் பின் ஒன்றாக பதிவிறக்கப்படவேண்டும்.",
 "Back to Files" => "கோப்புகளுக்கு செல்க",
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index 7cda4ab6ae6..4ec6ef55f4e 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -5,6 +5,7 @@
 "Users" => "ผู้ใช้งาน",
 "Apps" => "แอปฯ",
 "Admin" => "ผู้ดูแล",
+"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
 "ZIP download is turned off." => "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้",
 "Files need to be downloaded one by one." => "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น",
 "Back to Files" => "กลับไปที่ไฟล์",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 057894540c8..6325ad9886a 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -5,6 +5,7 @@
 "Users" => "Kullanıcılar",
 "Apps" => "Uygulamalar",
 "Admin" => "Yönetici",
+"web services under your control" => "Bilgileriniz güvenli ve şifreli",
 "ZIP download is turned off." => "ZIP indirmeleri kapatılmıştır.",
 "Files need to be downloaded one by one." => "Dosyaların birer birer indirilmesi gerekmektedir.",
 "Back to Files" => "Dosyalara dön",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index a50b5eb2648..7ff7829e1a2 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -5,6 +5,7 @@
 "Users" => "Користувачі",
 "Apps" => "Додатки",
 "Admin" => "Адмін",
+"web services under your control" => "підконтрольні Вам веб-сервіси",
 "ZIP download is turned off." => "ZIP завантаження вимкнено.",
 "Files need to be downloaded one by one." => "Файли повинні бути завантаженні послідовно.",
 "Back to Files" => "Повернутися до файлів",
diff --git a/lib/l10n/ur_PK.php b/lib/l10n/ur_PK.php
index 7e09d79bc68..21e711c6df5 100644
--- a/lib/l10n/ur_PK.php
+++ b/lib/l10n/ur_PK.php
@@ -4,5 +4,6 @@
 "Settings" => "سیٹینگز",
 "Users" => "یوزرز",
 "Apps" => "ایپز",
-"Admin" => "ایڈمن"
+"Admin" => "ایڈمن",
+"web services under your control" => "آپ کے اختیار میں ویب سروسیز"
 );
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
index 6a4b8ebac93..f2a7d669b8f 100644
--- a/lib/l10n/vi.php
+++ b/lib/l10n/vi.php
@@ -5,6 +5,7 @@
 "Users" => "Người dùng",
 "Apps" => "Ứng dụng",
 "Admin" => "Quản trị",
+"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
 "ZIP download is turned off." => "Tải về ZIP đã bị tắt.",
 "Files need to be downloaded one by one." => "Tập tin cần phải được tải về từng người một.",
 "Back to Files" => "Trở lại tập tin",
diff --git a/lib/l10n/zh_CN.GB2312.php b/lib/l10n/zh_CN.GB2312.php
index 3ab35f2bafa..4780a69eb34 100644
--- a/lib/l10n/zh_CN.GB2312.php
+++ b/lib/l10n/zh_CN.GB2312.php
@@ -5,6 +5,7 @@
 "Users" => "用户",
 "Apps" => "程序",
 "Admin" => "管理员",
+"web services under your control" => "您控制的网络服务",
 "ZIP download is turned off." => "ZIP 下载已关闭",
 "Files need to be downloaded one by one." => "需要逐个下载文件。",
 "Back to Files" => "返回到文件",
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 8bd87cbfe7f..7630f885c4a 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -5,6 +5,7 @@
 "Users" => "用户",
 "Apps" => "应用",
 "Admin" => "管理",
+"web services under your control" => "您控制的web服务",
 "ZIP download is turned off." => "ZIP 下载已经关闭",
 "Files need to be downloaded one by one." => "需要逐一下载文件",
 "Back to Files" => "回到文件",
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 43e37ad3ad4..afd196f7c82 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -5,6 +5,7 @@
 "Users" => "使用者",
 "Apps" => "應用程式",
 "Admin" => "管理",
+"web services under your control" => "由您控制的網路服務",
 "ZIP download is turned off." => "ZIP 下載已關閉。",
 "Files need to be downloaded one by one." => "檔案需要逐一下載。",
 "Back to Files" => "回到檔案列表",
diff --git a/lib/public/share.php b/lib/public/share.php
index de7025d7b15..7ae0ffe0bfd 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -292,6 +292,29 @@ class Share {
 	}
 
 	/**
+	 * @brief resolves reshares down to the last real share
+	 * @param $linkItem
+	 * @return $fileOwner
+	 */
+	public static function resolveReShare($linkItem)
+	{
+		if (isset($linkItem['parent'])) {
+			$parent = $linkItem['parent'];
+			while (isset($parent)) {
+				$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `id` = ?', 1);
+				$item = $query->execute(array($parent))->fetchRow();
+				if (isset($item['parent'])) {
+					$parent = $item['parent'];
+				} else {
+					return $item;
+				}
+			}
+		}
+		return $linkItem;
+	}
+
+
+	/**
 	* @brief Get the shared items of item type owned by the current user
 	* @param string Item type
 	* @param int Format (optional) Format type must be defined by the backend
@@ -312,7 +335,7 @@ class Share {
 	* @return Return depends on format
 	*/
 	public static function getItemShared($itemType, $itemSource, $format = self::FORMAT_NONE,
-		$parameters = null, $includeCollections = false) {
+	                                     $parameters = null, $includeCollections = false) {
 		return self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), $format,
 			$parameters, -1, $includeCollections);
 	}
diff --git a/lib/util.php b/lib/util.php
index 4bc02daf36e..8f5f79b6b09 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -172,6 +172,8 @@ class OC_Util {
 	public static function checkServer() {
 		$errors=array();
 
+		$defaults = new \OC_Defaults();
+
 		$web_server_restart= false;
 		//check for database drivers
 		if(!(is_callable('sqlite_open') or class_exists('SQLite3'))
@@ -184,14 +186,16 @@ class OC_Util {
 		}
 
 		//common hint for all file permissons error messages
-		$permissionsHint='Permissions can usually be fixed by giving the webserver write access'
-			.' to the ownCloud directory';
+		$permissionsHint = 'Permissions can usually be fixed by '
+			.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.';
 
 		// Check if config folder is writable.
 		if(!is_writable(OC::$SERVERROOT."/config/") or !is_readable(OC::$SERVERROOT."/config/")) {
-			$errors[]=array('error'=>"Can't write into config directory 'config'",
-				'hint'=>'You can usually fix this by giving the webserver user write access'
-					.' to the config directory in owncloud');
+			$errors[] = array(
+				'error' => "Can't write into config directory",
+				'hint' => 'This can usually be fixed by '
+					.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.'
+				);
 		}
 
 		// Check if there is a writable install folder.
@@ -199,9 +203,12 @@ class OC_Util {
 			if( OC_App::getInstallPath() === null
 				|| !is_writable(OC_App::getInstallPath())
 				|| !is_readable(OC_App::getInstallPath()) ) {
-				$errors[]=array('error'=>"Can't write into apps directory",
-					'hint'=>'You can usually fix this by giving the webserver user write access'
-					.' to the apps directory in owncloud or disabling the appstore in the config file.');
+				$errors[] = array(
+					'error' => "Can't write into apps directory",
+					'hint' => 'This can usually be fixed by '
+						.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the apps directory</a> '
+						.'or disabling the appstore in the config file.'
+					);
 			}
 		}
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
@@ -211,10 +218,11 @@ class OC_Util {
 			if ($success) {
 				$errors = array_merge($errors, self::checkDataDirectoryPermissions($CONFIG_DATADIRECTORY));
 			} else {
-				$errors[]=array('error'=>"Can't create data directory (".$CONFIG_DATADIRECTORY.")",
-					'hint'=>"You can usually fix this by giving the webserver write access to the ownCloud directory '"
-						.OC::$SERVERROOT."' (in a terminal, use the command "
-						."'chown -R www-data:www-data /path/to/your/owncloud/install/data' ");
+				$errors[] = array(
+					'error' => "Can't create data directory (".$CONFIG_DATADIRECTORY.")",
+					'hint' => 'This can usually be fixed by '
+					.'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the root directory</a>.'
+				);
 			}
 		} else if(!is_writable($CONFIG_DATADIRECTORY) or !is_readable($CONFIG_DATADIRECTORY)) {
 			$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') not writable by ownCloud',