Merge branch 'master' into sharing_mail_notification_master

Conflicts:
	apps/files/index.php

12 files changed, 239 insertions, 4 deletions

diff --git a/settings/css/settings.css b/settings/css/settings.css
index d5ffe448482..57a43180a43 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -21,6 +21,10 @@ input#openid, input#webdav { width:20em; }
 input#identity { width:20em; }
 #email { width: 17em; }
 
+#avatar .warning {
+	width: 350px;
+}
+
 .msg.success{ color:#fff; background-color:#0f0; padding:3px; text-shadow:1px 1px #000; }
 .msg.error{ color:#fff; background-color:#f00; padding:3px; text-shadow:1px 1px #000; }
 
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 8ad26c086b5..fab32b83b64 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -44,6 +44,78 @@ function changeDisplayName(){
     }
 }
 
+function updateAvatar () {
+	$headerdiv = $('#header .avatardiv');
+	$displaydiv = $('#displayavatar .avatardiv');
+
+	$headerdiv.css({'background-color': ''});
+	$headerdiv.avatar(OC.currentUser, 32, true);
+	$displaydiv.css({'background-color': ''});
+	$displaydiv.avatar(OC.currentUser, 128, true);
+}
+
+function showAvatarCropper() {
+	$cropper = $('#cropper');
+	$cropper.prepend("<img>");
+	$cropperImage = $('#cropper img');
+
+	$cropperImage.attr('src', OC.Router.generate('core_avatar_get_tmp')+'?requesttoken='+oc_requesttoken+'#'+Math.floor(Math.random()*1000));
+
+	// Looks weird, but on('load', ...) doesn't work in IE8
+	$cropperImage.ready(function(){
+		$('#displayavatar').hide();
+		$cropper.show();
+
+		$cropperImage.Jcrop({
+			onChange: saveCoords,
+			onSelect: saveCoords,
+			aspectRatio: 1,
+			boxHeight: 500,
+			boxWidth: 500,
+			setSelect: [0, 0, 300, 300]
+		});
+	});
+}
+
+function sendCropData() {
+	cleanCropper();
+
+	var cropperdata = $('#cropper').data();
+	var data = {
+		x: cropperdata.x,
+		y: cropperdata.y,
+		w: cropperdata.w,
+		h: cropperdata.h
+	};
+	$.post(OC.Router.generate('core_avatar_post_cropped'), {crop: data}, avatarResponseHandler);
+}
+
+function saveCoords(c) {
+	$('#cropper').data(c);
+}
+
+function cleanCropper() {
+	$cropper = $('#cropper');
+	$('#displayavatar').show();
+	$cropper.hide();
+	$('.jcrop-holder').remove();
+	$('#cropper img').removeData('Jcrop').removeAttr('style').removeAttr('src');
+	$('#cropper img').remove();
+}
+
+function avatarResponseHandler(data) {
+	$warning = $('#avatar .warning');
+	$warning.hide();
+	if (data.status === "success") {
+		updateAvatar();
+	} else if (data.data === "notsquare") {
+		showAvatarCropper();
+	} else {
+		$warning.show();
+		$warning.text(data.data.message);
+	}
+}
+
 $(document).ready(function(){
 	$("#passwordbutton").click( function(){
 		if ($('#pass1').val() !== '' && $('#pass2').val() !== '') {
@@ -94,7 +166,7 @@ $(document).ready(function(){
 	$("#languageinput").chosen();
 	// Show only the not selectable optgroup
 	// Choosen only shows optgroup-labels if there are options in the optgroup
-	$(".languagedivider").remove();
+	$(".languagedivider").hide();
 
 	$("#languageinput").change( function(){
 		// Serialize the data
@@ -128,6 +200,46 @@ $(document).ready(function(){
 		}
 	});
 	
+	var uploadparms = {
+		done: function(e, data) {
+			avatarResponseHandler(data.result);
+		}
+	};
+
+	$('#uploadavatarbutton').click(function(){
+		$('#uploadavatar').click();
+	});
+
+	$('#uploadavatar').fileupload(uploadparms);
+
+	$('#selectavatar').click(function(){
+		OC.dialogs.filepicker(
+			t('settings', "Select a profile picture"),
+			function(path){
+				$.post(OC.Router.generate('core_avatar_post'), {path: path}, avatarResponseHandler);
+			},
+			false,
+			["image/png", "image/jpeg"]
+		);
+	});
+
+	$('#removeavatar').click(function(){
+		$.ajax({
+			type:	'DELETE',
+			url:	OC.Router.generate('core_avatar_delete'),
+			success: function(msg) {
+				updateAvatar();
+			}
+		});
+	});
+
+	$('#abortcropperbutton').click(function(){
+		cleanCropper();
+	});
+
+	$('#sendcropperbutton').click(function(){
+		sendCropData();
+	});
 } );
 
 OC.Encryption = {
diff --git a/settings/js/users.js b/settings/js/users.js
index ab08d7099c6..01a845367e2 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -91,13 +91,13 @@ var UserList = {
 		tr.find('td.displayName > span').text(displayname);
 		var groupsSelect = $('<select multiple="multiple" class="groupsselect" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
 			.attr('data-username', username)
-			.attr('data-user-groups', [groups]);
+			.data('user-groups', groups);
 		tr.find('td.groups').empty();
 		if (tr.find('td.subadmins').length > 0) {
 			var subadminSelect = $('<select multiple="multiple" class="subadminsselect" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
 				.attr('data-username', username)
-				.attr('data-user-groups', [groups])
-				.attr('data-subadmin', [subadmin]);
+				.data('user-groups', groups)
+				.data('subadmin', subadmin);
 			tr.find('td.subadmins').empty();
 		}
 		$.each(this.availableGroups, function (i, group) {
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index f4f50e5949a..252692ea4c3 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Desactivar",
 "Enable" => "Activar",
 "Please wait...." => "Por favor, esperá....",
+"Error while disabling app" => "Se ha producido un error mientras se deshabilitaba la aplicación",
+"Error while enabling app" => "Se ha producido un error mientras se habilitaba la aplicación",
 "Updating...." => "Actualizando....",
 "Error while updating app" => "Error al actualizar App",
 "Error" => "Error",
 "Update" => "Actualizar",
 "Updated" => "Actualizado",
+"Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
 "Saving..." => "Guardando...",
 "deleted" => "borrado",
 "undo" => "deshacer",
@@ -38,14 +41,20 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Debe ingresar una contraseña válida",
 "__language_name__" => "Castellano (Argentina)",
 "Security Warning" => "Advertencia de seguridad",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web.",
 "Setup Warning" => "Alerta de Configuración",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Por favor, cheque bien la <a href=\"%s\">guía de instalación</a>.",
 "Module 'fileinfo' missing" => "El módulo 'fileinfo' no existe",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type",
 "Locale not working" => "\"Locale\" no está funcionando",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "No se pudo asignar la localización del sistema a %s. Esto significa que puede haber problemas con ciertos caracteres en los nombres de los archivos. Recomendamos fuertemente instalar los paquetes de sistema requeridos para poder dar soporte a %s.",
 "Internet connection not working" => "La conexión a Internet no esta funcionando. ",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Ejecutá una tarea con cada pagina cargada.",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php está registrado al servicio webcron para que sea llamado una vez por cada minuto sobre http.",
+"Use systems cron service to call the cron.php file once a minute." => "Usa el servicio cron del sistema para ejecutar al archivo cron.php por cada minuto.",
 "Sharing" => "Compartiendo",
 "Enable Share API" => "Habilitar Share API",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
@@ -59,6 +68,8 @@ $TRANSLATIONS = array(
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir sólo con los de sus mismos grupos",
 "Security" => "Seguridad",
 "Enforce HTTPS" => "Forzar HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
 "Log" => "Log",
 "Log level" => "Nivel de Log",
 "More" => "Más",
@@ -94,6 +105,9 @@ $TRANSLATIONS = array(
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Usá esta dirección para <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">acceder a tus archivos a través de WebDAV</a>",
 "Encryption" => "Encriptación",
+"The encryption app is no longer enabled, decrypt all your file" => "La aplicación de encriptación ya no está habilitada, desencriptando todos los archivos",
+"Log-in password" => "Clave de acceso",
+"Decrypt all Files" => "Desencriptar todos los archivos",
 "Login Name" => "Nombre de Usuario",
 "Create" => "Crear",
 "Admin Recovery Password" => "Recuperación de contraseña de administrador",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 4549dcea52c..d0a8abea713 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Invalid request" => "داواکارى نادروستە",
 "Enable" => "چالاککردن",
 "Error" => "هه‌ڵه",
 "Update" => "نوێکردنه‌وه",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index da0fb8f56b5..31c9e2be59f 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -2,6 +2,8 @@
 $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
 "Authentication error" => "Autentikacijos klaida",
+"Your display name has been changed." => "Jūsų rodomas vardas buvo pakeistas.",
+"Unable to change display name" => "Nepavyksta pakeisti rodomą vardą",
 "Group already exists" => "Grupė jau egzistuoja",
 "Unable to add group" => "Nepavyko pridėti grupės",
 "Email saved" => "El. paštas išsaugotas",
@@ -10,6 +12,7 @@ $TRANSLATIONS = array(
 "Unable to delete user" => "Nepavyko ištrinti vartotojo",
 "Language changed" => "Kalba pakeista",
 "Invalid request" => "Klaidinga užklausa",
+"Admins can't remove themself from the admin group" => "Administratoriai negali pašalinti savęs iš administratorių grupės",
 "Unable to add user to group %s" => "Nepavyko pridėti vartotojo prie grupės %s",
 "Unable to remove user from group %s" => "Nepavyko ištrinti vartotojo iš grupės %s",
 "Couldn't update app." => "Nepavyko atnaujinti programos.",
@@ -17,16 +20,20 @@ $TRANSLATIONS = array(
 "Disable" => "Išjungti",
 "Enable" => "Įjungti",
 "Please wait...." => "Prašome palaukti...",
+"Error while disabling app" => "Klaida išjungiant programą",
+"Error while enabling app" => "Klaida įjungiant programą",
 "Updating...." => "Atnaujinama...",
 "Error while updating app" => "Įvyko klaida atnaujinant programą",
 "Error" => "Klaida",
 "Update" => "Atnaujinti",
 "Updated" => "Atnaujinta",
+"Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
 "Saving..." => "Saugoma...",
 "deleted" => "ištrinta",
 "undo" => "anuliuoti",
 "Unable to remove user" => "Nepavyko ištrinti vartotojo",
 "Groups" => "Grupės",
+"Group Admin" => "Grupės administratorius",
 "Delete" => "Ištrinti",
 "add group" => "pridėti grupę",
 "A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
@@ -34,42 +41,83 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Slaptažodis turi būti tinkamas",
 "__language_name__" => "Kalba",
 "Security Warning" => "Saugumo pranešimas",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko.",
+"Setup Warning" => "Nustatyti perspėjimą",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Prašome pažiūrėkite dar kartą <a href=\"%s\">diegimo instrukcijas</a>.",
 "Module 'fileinfo' missing" => "Trūksta 'fileinfo' modulio",
+"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
+"Locale not working" => "Lokalė neveikia",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Negalima nustatyti sistemos lokalės į %s. Tai reiškia, kad gali būti problemų su tam tikrais simboliais failų pavadinimuose. Labai rekomenduojame įdiegti reikalingus paketus Jūsų sistemoje, kad palaikyti %s.",
+"Internet connection not working" => "Nėra interneto ryšio",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas.",
 "Cron" => "Cron",
+"Execute one task with each page loaded" => "Įvykdyti vieną užduotį su kiekvieno puslapio įkėlimu",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "cron.php yra registruotas tinklapio suplanuotų užduočių paslaugose, kad iškviesti cron.php kartą per minutę per http.",
+"Use systems cron service to call the cron.php file once a minute." => "Naudoti sistemos planuotų užduočių paslaugą, kad iškvieti cron.php kartą per minutę.",
 "Sharing" => "Dalijimasis",
+"Enable Share API" => "Įjungti Share API",
+"Allow apps to use the Share API" => "Leidžia programoms naudoti Share API",
 "Allow links" => "Lesti nuorodas",
+"Allow users to share items to the public with links" => "Leisti naudotojams viešai dalintis elementais su nuorodomis",
+"Allow public uploads" => "Leisti viešus įkėlimus",
+"Allow users to enable others to upload into their publicly shared folders" => "Leisti naudotojams įgalinti kitus įkelti į savo viešai dalinamus aplankus",
 "Allow resharing" => "Leisti dalintis",
+"Allow users to share items shared with them again" => "Leisti naudotojams toliau dalintis elementais pasidalintais su jais",
+"Allow users to share with anyone" => "Leisti naudotojams dalintis su bet kuo",
+"Allow users to only share with users in their groups" => "Leisti naudotojams dalintis tik su naudotojais savo grupėje",
 "Security" => "Saugumas",
+"Enforce HTTPS" => "Reikalauti HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Verčia klientus jungtis prie %s per šifruotą ryšį.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
 "Log" => "Žurnalas",
 "Log level" => "Žurnalo išsamumas",
 "More" => "Daugiau",
 "Less" => "Mažiau",
 "Version" => "Versija",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Pridėti programėlę",
 "More Apps" => "Daugiau aplikacijų",
 "Select an App" => "Pasirinkite programą",
+"See application page at apps.owncloud.com" => "Žiūrėti programos puslapį svetainėje apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
+"User Documentation" => "Naudotojo dokumentacija",
+"Administrator Documentation" => "Administratoriaus dokumentacija",
+"Online Documentation" => "Dokumentacija tinkle",
 "Forum" => "Forumas",
 "Bugtracker" => "Klaidų sekimas",
+"Commercial Support" => "Komercinis palaikymas",
 "Get the apps to sync your files" => "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
+"Show First Run Wizard again" => "Rodyti pirmo karto vedlį dar kartą",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>",
 "Password" => "Slaptažodis",
 "Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
 "Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
 "Current password" => "Dabartinis slaptažodis",
 "New password" => "Naujas slaptažodis",
 "Change password" => "Pakeisti slaptažodį",
+"Display Name" => "Rodyti vardą",
 "Email" => "El. Paštas",
 "Your email address" => "Jūsų el. pašto adresas",
 "Fill in an email address to enable password recovery" => "Pamiršto slaptažodžio atkūrimui įveskite savo el. pašto adresą",
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Naudokite šį adresą, kad <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">pasiekti savo failus per WebDAV</a>",
 "Encryption" => "Šifravimas",
+"The encryption app is no longer enabled, decrypt all your file" => "Šifravimo programa nebėra įjungta, iššifruokite visus savo failus",
+"Log-in password" => "Prisijungimo slaptažodis",
+"Decrypt all Files" => "Iššifruoti visus failus",
 "Login Name" => "Vartotojo vardas",
 "Create" => "Sukurti",
+"Admin Recovery Password" => "Administracinis atkūrimo slaptažodis",
+"Enter the recovery password in order to recover the users files during password change" => "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
+"Default Storage" => "Numatytas saugojimas",
 "Unlimited" => "Neribota",
 "Other" => "Kita",
 "Username" => "Prisijungimo vardas",
+"Storage" => "Saugojimas",
+"change display name" => "keisti rodomą vardą",
 "set new password" => "nustatyti naują slaptažodį",
 "Default" => "Numatytasis"
 );
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 438e21d5bcf..822a17e7831 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -20,11 +20,14 @@ $TRANSLATIONS = array(
 "Disable" => "Slå av",
 "Enable" => "Slå på",
 "Please wait...." => "Ver venleg og vent …",
+"Error while disabling app" => "Klarte ikkje å skru av programmet",
+"Error while enabling app" => "Klarte ikkje å skru på programmet",
 "Updating...." => "Oppdaterer …",
 "Error while updating app" => "Feil ved oppdatering av app",
 "Error" => "Feil",
 "Update" => "Oppdater",
 "Updated" => "Oppdatert",
+"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
 "Saving..." => "Lagrar …",
 "deleted" => "sletta",
 "undo" => "angra",
@@ -38,25 +41,35 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Du må oppgje eit gyldig passord",
 "__language_name__" => "Nynorsk",
 "Security Warning" => "Tryggleiksåtvaring",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.",
 "Setup Warning" => "Oppsettsåtvaring",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
+"Please double check the <a href=\"%s\">installation guides</a>." => "Ver venleg og dobbeltsjekk <a href=\"%s\">installasjonsrettleiinga</a>.",
 "Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
 "Locale not working" => "Regionaldata fungerer ikkje",
+"System locale can't be set to %s. This means that there might be problems with certain characters in file names. We strongly suggest to install the required packages on your system to support %s." => "Klarte ikkje endra regionaldata for systemet til %s. Dette vil seia at det kan verta problem med visse teikn i filnamn. Me rår deg sterkt til å installera dei kravde pakkene på systemet ditt så du får støtte for %s.",
 "Internet connection not working" => "Nettilkoplinga fungerer ikkje",
+"This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.",
 "Cron" => "Cron",
 "Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
+"cron.php is registered at a webcron service to call cron.php once a minute over http." => "Ei webcron-teneste er stilt inn til å kalla cron.php ein gong i minuttet over http.",
+"Use systems cron service to call the cron.php file once a minute." => "Bruk cron-tenesta til systemet for å kalla cron.php-fila ein gong i minuttet.",
 "Sharing" => "Deling",
 "Enable Share API" => "Slå på API-et for deling",
 "Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
 "Allow links" => "Tillat lenkjer",
 "Allow users to share items to the public with links" => "La brukarar dela ting offentleg med lenkjer",
+"Allow public uploads" => "Tillat offentlege opplastingar",
+"Allow users to enable others to upload into their publicly shared folders" => "La brukarar tillata andre å lasta opp i deira offentleg delte mapper",
 "Allow resharing" => "Tillat vidaredeling",
 "Allow users to share items shared with them again" => "La brukarar vidaredela delte ting",
 "Allow users to share with anyone" => "La brukarar dela med kven som helst",
 "Allow users to only share with users in their groups" => "La brukarar dela berre med brukarar i deira grupper",
 "Security" => "Tryggleik",
 "Enforce HTTPS" => "Krev HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
 "Log" => "Logg",
 "Log level" => "Log nivå",
 "More" => "Meir",
@@ -90,8 +103,15 @@ $TRANSLATIONS = array(
 "Language" => "Språk",
 "Help translate" => "Hjelp oss å omsetja",
 "WebDAV" => "WebDAV",
+"Use this address to <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">access your Files via WebDAV</a>" => "Bruk denne adressa for å <a href=\"%s/server/5.0/user_manual/files/files.html\" target=\"_blank\">henta filene dine over WebDAV</a>",
+"Encryption" => "Kryptering",
+"The encryption app is no longer enabled, decrypt all your file" => "Krypteringsprogrammet er ikkje lenger slått på, dekrypter alle filene dine",
+"Log-in password" => "Innloggingspassord",
+"Decrypt all Files" => "Dekrypter alle filene",
 "Login Name" => "Innloggingsnamn",
 "Create" => "Lag",
+"Admin Recovery Password" => "Gjenopprettingspassord for administrator",
+"Enter the recovery password in order to recover the users files during password change" => "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
 "Default Storage" => "Standardlagring",
 "Unlimited" => "Ubegrensa",
 "Other" => "Anna",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index facffb9ba18..d4726a29bb6 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Authentication error" => "Veprim i gabuar gjatë vërtetimit të identitetit",
+"Invalid request" => "Kërkesë e pavlefshme",
 "Error" => "Veprim i gabuar",
 "Update" => "Azhurno",
 "undo" => "anulo",
@@ -11,6 +12,7 @@ $TRANSLATIONS = array(
 "Password" => "Kodi",
 "New password" => "Kodi i ri",
 "Email" => "Email-i",
+"Other" => "Të tjera",
 "Username" => "Përdoruesi"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/personal.php b/settings/personal.php
index 112eaa3c748..670e18e20ef 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -15,6 +15,11 @@ OC_Util::addScript( 'settings', 'personal' );
 OC_Util::addStyle( 'settings', 'settings' );
 OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
 OC_Util::addStyle( '3rdparty', 'chosen' );
+\OC_Util::addScript('files', 'jquery.fileupload');
+if (\OC_Config::getValue('enable_avatars', true) === true) {
+	\OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min');
+	\OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min');
+}
 OC_App::setActiveNavigationEntry( 'personal' );
 
 $storageInfo=OC_Helper::getStorageInfo('/');
@@ -84,6 +89,7 @@ $tmpl->assign('passwordChangeSupported', OC_User::canUserChangePassword(OC_User:
 $tmpl->assign('displayNameChangeSupported', OC_User::canUserChangeDisplayName(OC_User::getUser()));
 $tmpl->assign('displayName', OC_User::getDisplayName());
 $tmpl->assign('enableDecryptAll' , $enableDecryptAll);
+$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
 
 $forms=OC_App::getForms('personal');
 $tmpl->assign('forms', array());
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 63e1258b958..d2ca8154f16 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -80,6 +80,27 @@ if($_['passwordChangeSupported']) {
 }
 ?>
 
+<?php if ($_['enableAvatars']): ?>
+<form id="avatar" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>">
+	<fieldset class="personalblock">
+		<legend><strong><?php p($l->t('Profile picture')); ?></strong></legend>
+		<div id="displayavatar">
+			<div class="avatardiv"></div><br>
+			<div class="warning hidden"></div>
+			<div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div>
+			<input type="file" class="hidden" name="files[]" id="uploadavatar">
+			<div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div>
+			<div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br>
+			<?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it.')); ?>
+		</div>
+		<div id="cropper" class="hidden">
+			<div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Abort')); ?></div>
+			<div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile image')); ?></div>
+		</div>
+	</fieldset>
+</form>
+<?php endif; ?>
+
 <form>
 	<fieldset class="personalblock">
 		<legend><strong><?php p($l->t('Language'));?></strong></legend>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 22450fdf25f..747d052a7bd 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -81,6 +81,9 @@ $_['subadmingroups'] = array_flip($items);
 <table class="hascontrols" data-groups="<?php p(json_encode($allGroups));?>">
 	<thead>
 		<tr>
+			<?php if ($_['enableAvatars']): ?>
+			<th id='headerAvatar'></th>
+			<?php endif; ?>
 			<th id='headerName'><?php p($l->t('Username'))?></th>
 			<th id="headerDisplayName"><?php p($l->t( 'Display Name' )); ?></th>
 			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
@@ -96,6 +99,9 @@ $_['subadmingroups'] = array_flip($items);
 		<?php foreach($_["users"] as $user): ?>
 		<tr data-uid="<?php p($user["name"]) ?>"
 			data-displayName="<?php p($user["displayName"]) ?>">
+			<?php if ($_['enableAvatars']): ?>
+			<td class="avatar"><div class="avatardiv"></div></td>
+			<?php endif; ?>
 			<td class="name"><?php p($user["name"]); ?></td>
 			<td class="displayName"><span><?php p($user["displayName"]); ?></span> <img class="svg action"
 				src="<?php p(image_path('core', 'actions/rename.svg'))?>"
diff --git a/settings/users.php b/settings/users.php
index 213d1eecfda..2f1c63a0b59 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -81,4 +81,5 @@ $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
 $tmpl->assign( 'defaultQuotaIsUserDefined', $defaultQuotaIsUserDefined);
 $tmpl->assign( 'recoveryAdminEnabled', $recoveryAdminEnabled);
+$tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
 $tmpl->printPage();