Merge branch 'master' into calendar

29 files changed, 493 insertions, 71 deletions

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 8fb628a205c..7b9e5cff0c0 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -435,6 +435,7 @@ Calendar={
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
 							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
 							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+							$('#choosecalendar_dialog > table').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);">' + newcalendar + '</a></td></tr>');
 						}
 					}, 'json');
 			},
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index 617fc2a2ff0..aae6f235fc4 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -79,6 +79,25 @@
 "Today" => "Heute",
 "Calendars" => "Kalender",
 "There was a fail, while parsing the file." => "Fehler beim Einlesen der Datei.",
+"Sun." => "So",
+"Mon." => "Mo",
+"Tue." => "Die",
+"Wed." => "Mi",
+"Thu." => "Do",
+"Fri." => "Fr",
+"Sat." => "Sa",
+"Jan." => "Jan",
+"Feb." => "Feb",
+"Mar." => "Mär",
+"Apr." => "Apr",
+"May." => "Mai",
+"Jun." => "Juni",
+"Jul." => "Juli",
+"Aug." => "Aug",
+"Sep." => "Sep",
+"Oct." => "Okt",
+"Nov." => "Nov",
+"Dec." => "Dez",
 "Choose active calendars" => "Aktive Kalender wählen",
 "New Calendar" => "Neuer Kalender",
 "CalDav Link" => "CalDAV-Link",
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
index 82b58f6ad61..36ce1ad875c 100644
--- a/apps/calendar/l10n/fr.php
+++ b/apps/calendar/l10n/fr.php
@@ -133,8 +133,14 @@
 "Location of the Event" => "Emplacement de l'événement",
 "Description" => "Description",
 "Description of the Event" => "Description de l'événement",
+"Import a calendar file" => "Importer un fichier de calendriers",
 "Please choose the calendar" => "Choisissez le calendrier svp",
+"create a new calendar" => "Créer un nouveau calendrier",
+"Name of new calendar" => "Nom pour le nouveau calendrier",
 "Import" => "Importer",
+"Importing calendar" => "Import du calendrier",
+"Calendar imported successfully" => "Calendrier importé avec succès",
+"Close Dialog" => "Fermer la fenêtre",
 "Create a new event" => "Créer un nouvel événement",
 "Timezone" => "Fuseau horaire",
 "Check always for changes of the timezone" => "Toujours vérifier d'éventuels changements de fuseau horaire",
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
new file mode 100644
index 00000000000..6cdaa98e96b
--- /dev/null
+++ b/apps/calendar/l10n/gl.php
@@ -0,0 +1,154 @@
+<?php $TRANSLATIONS = array(
+"New Timezone:" => "Novo fuso horario:",
+"Timezone changed" => "Fuso horario trocado",
+"Invalid request" => "Petición non válida",
+"Calendar" => "Calendario",
+"Wrong calendar" => "Calendario equivocado",
+"Birthday" => "Cumpleanos",
+"Business" => "Traballo",
+"Call" => "Chamada",
+"Clients" => "Clientes",
+"Holidays" => "Vacacións",
+"Ideas" => "Ideas",
+"Journey" => "Viaxe",
+"Jubilee" => "Aniversario",
+"Meeting" => "Reunión",
+"Other" => "Outro",
+"Personal" => "Personal",
+"Projects" => "Proxectos",
+"Questions" => "Preguntas",
+"Work" => "Traballo",
+"Does not repeat" => "Non se repite",
+"Daily" => "A diario",
+"Weekly" => "Semanalmente",
+"Every Weekday" => "Tódalas semanas",
+"Bi-Weekly" => "Cada dúas semanas",
+"Monthly" => "Mensualmente",
+"Yearly" => "Anual",
+"never" => "nunca",
+"by occurrences" => "por acontecementos",
+"by date" => "por data",
+"by monthday" => "por día do mes",
+"by weekday" => "por día da semana",
+"Monday" => "Luns",
+"Tuesday" => "Martes",
+"Wednesday" => "Mércores",
+"Thursday" => "Xoves",
+"Friday" => "Venres",
+"Saturday" => "Sábado",
+"Sunday" => "Domingo",
+"events week of month" => "semana dos eventos no mes",
+"first" => "primeiro",
+"second" => "segundo",
+"third" => "terceiro",
+"fourth" => "cuarto",
+"fifth" => "quinto",
+"last" => "último",
+"January" => "Xaneiro",
+"February" => "Febreiro",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Xuño",
+"July" => "Xullo",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Nadal",
+"by events date" => "por data dos eventos",
+"by yearday(s)" => "por dia(s) do ano",
+"by weeknumber(s)" => "por número(s) de semana",
+"by day and month" => "por día e mes",
+"Not an array" => "Non é un conxunto",
+"Date" => "Data",
+"Cal." => "Cal.",
+"All day" => "Todo o dia",
+"Missing fields" => "Faltan campos",
+"Title" => "Título",
+"From Date" => "Desde Data",
+"From Time" => "Desde Hora",
+"To Date" => "a Data",
+"To Time" => "a Hora",
+"The event ends before it starts" => "O evento remata antes de iniciarse",
+"There was a database fail" => "Houbo un erro na base de datos",
+"Week" => "Semana",
+"Month" => "Mes",
+"List" => "Lista",
+"Today" => "Hoxe",
+"Calendars" => "Calendarios",
+"There was a fail, while parsing the file." => "Houbo un erro ao procesar o ficheiro",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Xov.",
+"Fri." => "Ven.",
+"Sat." => "Sáb.",
+"Jan." => "Xan.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Abr.",
+"May." => "Mai.",
+"Jun." => "Xuñ.",
+"Jul." => "Xul.",
+"Aug." => "Ago.",
+"Sep." => "Set.",
+"Oct." => "Out.",
+"Nov." => "Nov.",
+"Dec." => "Nad.",
+"Choose active calendars" => "Escolla os calendarios activos",
+"New Calendar" => "Novo calendario",
+"CalDav Link" => "Ligazón CalDav",
+"Download" => "Baixar",
+"Edit" => "Editar",
+"Delete" => "Borrar",
+"New calendar" => "Novo calendario",
+"Edit calendar" => "Editar calendario",
+"Displayname" => "Mostrar nome",
+"Active" => "Activo",
+"Calendar color" => "Cor do calendario",
+"Save" => "Gardar",
+"Submit" => "Enviar",
+"Cancel" => "Cancelar",
+"Edit an event" => "Editar un evento",
+"Export" => "Exportar",
+"Title of the Event" => "Título do evento",
+"Category" => "Categoría",
+"Select category" => "Seleccionar categoría",
+"All Day Event" => "Evento para todo o día",
+"From" => "Desde",
+"To" => "Para",
+"Advanced options" => "Opcións avanzadas",
+"Repeat" => "Repetir",
+"Advanced" => "Avanzado",
+"Select weekdays" => "Seleccionar días da semana",
+"Select days" => "Seleccionar días",
+"and the events day of year." => "e día dos eventos no ano.",
+"and the events day of month." => "e día dos eventos no mes.",
+"Select months" => "Seleccione meses",
+"Select weeks" => "Seleccione semanas",
+"and the events week of year." => "e semana dos eventos no ano.",
+"Interval" => "Intervalo",
+"End" => "Fin",
+"occurrences" => "acontecementos",
+"Location" => "Localización",
+"Location of the Event" => "Localización do evento",
+"Description" => "Descripción",
+"Description of the Event" => "Descripción do evento",
+"Import a calendar file" => "Importar ficheiro de calendario",
+"Please choose the calendar" => "Por favor, seleccione o calendario",
+"create a new calendar" => "crear un novo calendario",
+"Name of new calendar" => "Nome do novo calendario",
+"Import" => "Importar",
+"Importing calendar" => "Importar calendario",
+"Calendar imported successfully" => "Calendario importado con éxito",
+"Close Dialog" => "Pechar cadro",
+"Create a new event" => "Crear un novo evento",
+"Timezone" => "Fuso horario",
+"Check always for changes of the timezone" => "Comprobar sempre cambios de fuso horario",
+"Timeformat" => "Formato de hora",
+"24h" => "24h",
+"12h" => "12h",
+"Calendar CalDAV syncing address:" => "Dirección de sincronización do calendario CalDAV:"
+);
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
index 71cfa6c8464..cb125043593 100644
--- a/apps/calendar/l10n/it.php
+++ b/apps/calendar/l10n/it.php
@@ -38,6 +38,7 @@
 "Friday" => "Venerdì",
 "Saturday" => "Sabato",
 "Sunday" => "Domenica",
+"events week of month" => "settimana del mese degli eventi",
 "first" => "primo",
 "second" => "secondo",
 "third" => "terzo",
@@ -56,6 +57,10 @@
 "October" => "Ottobre",
 "November" => "Novembre",
 "December" => "Dicembre",
+"by events date" => "per data evento",
+"by yearday(s)" => "per giorno/i dell'anno",
+"by weeknumber(s)" => "per numero/i settimana",
+"by day and month" => "per giorno e mese",
 "Not an array" => "Non è un array",
 "Date" => "Data",
 "Cal." => "Cal.",
@@ -74,6 +79,25 @@
 "Today" => "Oggi",
 "Calendars" => "Calendari",
 "There was a fail, while parsing the file." => "C'è stato un errore nel parsing del file.",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Gio.",
+"Fri." => "Ven.",
+"Sat." => "Sab.",
+"Jan." => "Gen.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Mag.",
+"Jun." => "Giu.",
+"Jul." => "Lug.",
+"Aug." => "Ago.",
+"Sep." => "Set.",
+"Oct." => "Ott.",
+"Nov." => "Nov.",
+"Dec." => "Dic.",
 "Choose active calendars" => "Selezionare calendari attivi",
 "New Calendar" => "Nuovo Calendario",
 "CalDav Link" => "CalDav Link",
@@ -98,18 +122,29 @@
 "To" => "A",
 "Advanced options" => "Opzioni avanzate",
 "Repeat" => "Ripeti",
+"Advanced" => "Avanzato",
 "Select weekdays" => "Seleziona i giorni della settimana",
 "Select days" => "Seleziona i giorni",
+"and the events day of year." => "e il giorno dell'anno degli eventi",
+"and the events day of month." => "e il giorno del mese degli eventi",
 "Select months" => "Seleziona i mesi",
 "Select weeks" => "Seleziona le settimane",
+"and the events week of year." => "e la settimana dell'anno degli eventi",
 "Interval" => "Intervallo",
 "End" => "Fine",
+"occurrences" => "occorrenze",
 "Location" => "Luogo",
 "Location of the Event" => "Luogo evento",
 "Description" => "Descrizione",
 "Description of the Event" => "Descrizione evento",
+"Import a calendar file" => "Importa un file calendario",
 "Please choose the calendar" => "Per favore scegli il calendario",
+"create a new calendar" => "Crea un nuovo calendario",
+"Name of new calendar" => "Nome del nuovo calendario",
 "Import" => "Importa",
+"Importing calendar" => "Sto importando il calendario",
+"Calendar imported successfully" => "Calendario importato con successo",
+"Close Dialog" => "Chiudi la finestra di dialogo",
 "Create a new event" => "Crea evento",
 "Timezone" => "Fuso orario",
 "Check always for changes of the timezone" => "Controlla sempre i cambiamenti di fuso orario",
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
index 6b2cd68c6fb..feafd17635b 100755
--- a/apps/calendar/templates/calendar.php
+++ b/apps/calendar/templates/calendar.php
@@ -7,16 +7,17 @@
 				var monthNamesShort = <?php echo json_encode($l->tA(array('Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'))) ?>;
 				var agendatime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>{ - <?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>}';
 				var defaulttime = '<?php echo ((int) OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timeformat', '24') == 24 ? 'HH:mm' : 'hh:mm tt'); ?>';
-				var allDayText = '<?php echo $l->t('All day') ?>';
-				var missing_field = '<?php echo $l->t('Missing fields') ?>';
-				var missing_field_title = '<?php echo $l->t('Title') ?>';
-				var missing_field_calendar = '<?php echo $l->t('Calendar') ?>';
-				var missing_field_fromdate = '<?php echo $l->t('From Date') ?>';
-				var missing_field_fromtime = '<?php echo $l->t('From Time') ?>';
-				var missing_field_todate = '<?php echo $l->t('To Date') ?>';
-				var missing_field_totime = '<?php echo $l->t('To Time') ?>';
-				var missing_field_startsbeforeends = '<?php echo $l->t('The event ends before it starts') ?>';
-				var missing_field_dberror = '<?php echo $l->t('There was a database fail') ?>';
+				var allDayText = '<?php echo addslashes($l->t('All day')) ?>';
+				var newcalendar = '<?php echo addslashes($l->t('New Calendar')) ?>';
+				var missing_field = '<?php echo addslashes($l->t('Missing fields')) ?>';
+				var missing_field_title = '<?php echo addslashes($l->t('Title')) ?>';
+				var missing_field_calendar = '<?php echo addslashes($l->t('Calendar')) ?>';
+				var missing_field_fromdate = '<?php echo addslashes($l->t('From Date')) ?>';
+				var missing_field_fromtime = '<?php echo addslashes($l->t('From Time')) ?>';
+				var missing_field_todate = '<?php echo addslashes($l->t('To Date')) ?>';
+				var missing_field_totime = '<?php echo addslashes($l->t('To Time')) ?>';
+				var missing_field_startsbeforeends = '<?php echo addslashes($l->t('The event ends before it starts')) ?>';
+				var missing_field_dberror = '<?php echo addslashes($l->t('There was a database fail')) ?>';
 				var totalurl = '<?php echo OC_Helper::linkTo('apps/calendar', 'caldav.php', null, true); ?>/calendars';
 				$(document).ready(function() {
 				<?php
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 1b3fc607729..f421651671d 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
+"There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
+"Cannot add empty property." => "No es pot afegir una propietat buida.",
+"At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
+"Error adding contact property." => "Error en afegir la propietat del contacte.",
+"Error adding addressbook." => "Error en afegir la llibreta d'adreces.",
+"Error activating addressbook." => "Error en activar la llibreta d'adreces.",
+"Error deleting contact property." => "Error en eliminar la propietat del contacte.",
+"Error updating contact property." => "Error en actualitzar la propietat del contacte.",
+"Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
+"Contacts" => "Contactes",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
 "Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
@@ -14,10 +25,13 @@
 "Fax" => "Fax",
 "Video" => "Vídeo",
 "Pager" => "Paginador",
+"Contact" => "Contacte",
 "This is not your contact." => "Aquest contacte no és vostre.",
 "This card is not RFC compatible." => "Aquesta targeta no és compatible amb RFC.",
 "This card does not contain a photo." => "Aquesta targeta no conté foto.",
 "Add Contact" => "Afegiu un contacte",
+"Addressbooks" => "Llibretes d'adreces",
+"Addressbook" => "Llibreta d'adreces",
 "Name" => "Nom",
 "Type" => "Tipus",
 "PO Box" => "Adreça Postal",
@@ -34,8 +48,11 @@
 "Download" => "Baixa",
 "Edit" => "Edita",
 "Delete" => "Elimina",
+"Download contact" => "Baixa el contacte",
 "Delete contact" => "Elimina el contacte",
 "Add" => "Afegeix",
+"New Addressbook" => "Nova llibreta d'adreces",
+"Edit Addressbook" => "Edita la llibreta d'adreces",
 "Displayname" => "Nom a mostrar",
 "Active" => "Actiu",
 "Save" => "Desa",
@@ -44,5 +61,6 @@
 "Birthday" => "Aniversari",
 "Preferred" => "Preferit",
 "Phone" => "Telèfon",
-"Update" => "Actualitza"
+"Update" => "Actualitza",
+"CardDAV syncing address:" => "Adreça de sincronització CardDAV:"
 );
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 465e2d5456a..8970d716b0e 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
+"There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
+"Cannot add empty property." => "Impossible d'ajouter un champ vide.",
+"At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
+"Error adding contact property." => "Erreur lors de l'ajout du champ.",
+"Error adding addressbook." => "Erreur lors de l'ajout du carnet d'adresses.",
+"Error activating addressbook." => "Erreur lors de l'activation du carnet d'adresses.",
+"Error deleting contact property." => "Erreur lors de la suppression du champ.",
+"Error updating contact property." => "Erreur lors de la mise à jour du champ.",
+"Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
+"Contacts" => "Contacts",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pas été trouvé.",
 "Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
@@ -14,10 +25,13 @@
 "Fax" => "Fax",
 "Video" => "Vidéo",
 "Pager" => "Bipeur",
+"Contact" => "Contact",
 "This is not your contact." => "Ce n'est pas votre contact.",
 "This card is not RFC compatible." => "Cette fiche n'est pas compatible RFC.",
 "This card does not contain a photo." => "Cette fiche ne contient pas de photo.",
 "Add Contact" => "Ajouter un Contact",
+"Addressbooks" => "Carnets d'adresses",
+"Addressbook" => "Carnet d'adresses",
 "Name" => "Nom",
 "Type" => "Type",
 "PO Box" => "Boîte postale",
@@ -34,8 +48,11 @@
 "Download" => "Télécharger",
 "Edit" => "Modifier",
 "Delete" => "Supprimer",
+"Download contact" => "Télécharger le contact",
 "Delete contact" => "Supprimer le contact",
 "Add" => "Ajouter",
+"New Addressbook" => "Nouveau carnet d'adresses",
+"Edit Addressbook" => "Éditer le carnet d'adresses",
 "Displayname" => "Nom",
 "Active" => "Carnet actif",
 "Save" => "Sauvegarder",
@@ -44,5 +61,6 @@
 "Birthday" => "Anniversaire",
 "Preferred" => "Préféré",
 "Phone" => "Téléphone",
-"Update" => "Enregistrer"
+"Update" => "Enregistrer",
+"CardDAV syncing address:" => "Adresse de synchronisation CardDAV :"
 );
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
new file mode 100644
index 00000000000..0fd88ead191
--- /dev/null
+++ b/apps/contacts/l10n/gl.php
@@ -0,0 +1,66 @@
+<?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Erro (des)activando o directorio",
+"There was an error adding the contact." => "Houbo un erro engadindo o contacto",
+"Cannot add empty property." => "Non se pode engadir unha propiedade baldeira",
+"At least one of the address fields has to be filled out." => "A lo menos un dos campos de dirección ten que ser cuberto",
+"Error adding contact property." => "Erro engadindo unha propiedade do contacto.",
+"Error adding addressbook." => "Erro engadindo directorio.",
+"Error activating addressbook." => "Erro activando o directorio.",
+"Error deleting contact property." => "Erro borrando propiedade do contacto.",
+"Error updating contact property." => "Erro actualizando a propiedade do contacto.",
+"Error updating addressbook." => "Erro actualizando o directorio.",
+"Contacts" => "Contactos",
+"This is not your addressbook." => "Este non é o seu directorio",
+"Contact could not be found." => "Non se atopou o contacto",
+"Information about vCard is incorrect. Please reload the page." => "A información sobre a vCard é incorrecta. Por favor volte a cargar a páxina.",
+"Address" => "Dirección",
+"Telephone" => "Teléfono",
+"Email" => "Correo electrónico",
+"Organization" => "Organización",
+"Work" => "Emprego",
+"Home" => "Casa",
+"Mobile" => "Móbil",
+"Text" => "Texto",
+"Voice" => "Voz",
+"Fax" => "Fax",
+"Video" => "Vídeo",
+"Pager" => "Paxinador",
+"Contact" => "Contacto",
+"This is not your contact." => "Este non é un dos seus contactos",
+"This card is not RFC compatible." => "Esta tarxeta non é compatible con RFC",
+"This card does not contain a photo." => "Esta tarxeta non ten fotografía",
+"Add Contact" => "Engadir contacto",
+"Addressbooks" => "Directorios",
+"Addressbook" => "Directorio",
+"Name" => "Nome",
+"Type" => "Escriba",
+"PO Box" => "Apartado de Correos",
+"Extended" => "Extendido",
+"Street" => "Rúa",
+"City" => "Cidade",
+"Region" => "Rexión",
+"Zipcode" => "Código Postal",
+"Country" => "País",
+"Create Contact" => "Crear contacto",
+"Choose active Address Books" => "Escolla os Directorios Activos",
+"New Address Book" => "Novo Directorio",
+"CardDav Link" => "Ligazón CardDav",
+"Download" => "Baixar",
+"Edit" => "Editar",
+"Delete" => "Eliminar",
+"Download contact" => "Descargar contacto",
+"Delete contact" => "Borrar contacto",
+"Add" => "Engadir",
+"New Addressbook" => "Novo Directorio",
+"Edit Addressbook" => "Editar Directorio",
+"Displayname" => "Mostrar nome",
+"Active" => "Activo",
+"Save" => "Gardar",
+"Submit" => "Enviar",
+"Cancel" => "Cancelar",
+"Birthday" => "Cumpleanos",
+"Preferred" => "Preferido",
+"Phone" => "Teléfono",
+"Update" => "Actualizar",
+"CardDAV syncing address:" => "Dirección de sincronización CardDAV:"
+);
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index c4360d89133..6ac1677e3c0 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -1,4 +1,15 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica",
+"There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
+"Cannot add empty property." => "Impossibile aggiungere una proprietà vuota.",
+"At least one of the address fields has to be filled out." => "Deve essere riempito almeno un indirizzo .",
+"Error adding contact property." => "Errore durante l'aggiunta della proprietà del contatto.",
+"Error adding addressbook." => "Errore nell'aggiunta della rubrica.",
+"Error activating addressbook." => "Errore nell'attivazione della rubrica.",
+"Error deleting contact property." => "Errore nella cancellazione della proprietà del contatto.",
+"Error updating contact property." => "Errore nell'aggiornamento della proprietà del contatto.",
+"Error updating addressbook." => "Errore nell'aggiornamento della rubrica.",
+"Contacts" => "Contatti",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato",
 "Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard incorrette. Ricaricare la pagina.",
@@ -14,10 +25,13 @@
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Cercapersone",
+"Contact" => "Contatto",
 "This is not your contact." => "Questo non è un tuo contatto.",
 "This card is not RFC compatible." => "Questa card non è compatibile con il protocollo RFC.",
 "This card does not contain a photo." => "Questa card non contiene una foto.",
 "Add Contact" => "Aggiungi contatto",
+"Addressbooks" => "Rubriche",
+"Addressbook" => "Rubrica",
 "Name" => "Nome",
 "Type" => "Tipo",
 "PO Box" => "Casella postale",
@@ -34,8 +48,11 @@
 "Download" => "Scarica",
 "Edit" => "Modifica",
 "Delete" => "Cancella",
+"Download contact" => "Scarica contatto",
 "Delete contact" => "Cancella contatto",
 "Add" => "Aggiungi",
+"New Addressbook" => "Nuova Rubrica",
+"Edit Addressbook" => "Modifica Rubrica",
 "Displayname" => "Nome da mostrare",
 "Active" => "Attiva",
 "Save" => "Salva",
@@ -44,5 +61,6 @@
 "Birthday" => "Compleanno",
 "Preferred" => "Preferito",
 "Phone" => "Telefono",
-"Update" => "Aggiorna"
+"Update" => "Aggiorna",
+"CardDAV syncing address:" => "Indirizzo di sincronizzazione CarDAV:"
 );
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
index 882381c37c2..d09bac430f2 100644
--- a/apps/contacts/l10n/sr.php
+++ b/apps/contacts/l10n/sr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Contacts" => "Контакти",
 "This is not your addressbook." => "Ово није ваш адресар.",
 "Contact could not be found." => "Контакт се не може наћи.",
 "Information about vCard is incorrect. Please reload the page." => "Подаци о вКарти су неисправни. Поново учитајте страницу.",
@@ -14,11 +15,15 @@
 "Fax" => "Факс",
 "Video" => "Видео",
 "Pager" => "Пејџер",
+"Contact" => "Контакт",
 "This is not your contact." => "Ово није ваш контакт.",
 "This card is not RFC compatible." => "Ова карта није сагласна са РФЦ-ом.",
 "This card does not contain a photo." => "Ова карта не садржи фотографију.",
 "Add Contact" => "Додај контакт",
+"Addressbooks" => "Адресар",
+"Addressbook" => "Адресар",
 "Name" => "Име",
+"Type" => "Тип",
 "PO Box" => "Поштански број",
 "Extended" => "Прошири",
 "Street" => "Улица",
@@ -27,8 +32,23 @@
 "Zipcode" => "Зип код",
 "Country" => "Земља",
 "Create Contact" => "Направи контакт",
+"Choose active Address Books" => "Изаберите активне адресаре",
+"New Address Book" => "Нови адресар",
+"Download" => "Преузимање",
 "Edit" => "Уреди",
 "Delete" => "Обриши",
+"Download contact" => "Преузми контакт",
+"Delete contact" => "Обриши контакт",
+"Add" => "Додај",
+"New Addressbook" => "Нови адресар",
+"Edit Addressbook" => "Уреди адресар",
+"Displayname" => "Приказано име",
+"Active" => "Активан",
+"Save" => "Сними",
+"Submit" => "Пошаљи",
+"Cancel" => "Откажи",
 "Birthday" => "Рођендан",
-"Phone" => "Телефон"
+"Preferred" => "Пожељан",
+"Phone" => "Телефон",
+"Update" => "Ажурирај"
 );
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 9af7f0654dd..679ae5ede2f 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -1,6 +1,6 @@
 <?php if(array_key_exists('FN',$_['details'])): ?>
 	<?php echo $this->inc('part.property.FN', array('property' => $_['details']['FN'][0])); ?>
-	<a href="export?contactid=<?php echo $_['id']; ?>"><img class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" /></a>
+	<a href="export.php?contactid=<?php echo $_['id']; ?>"><img class="svg action" id="contacts_downloadcard" src="<?php echo image_path('', 'actions/download.svg'); ?>" title="<?php echo $l->t('Download contact');?>" /></a>
 	<img class="svg action" id="contacts_deletecard" src="<?php echo image_path('', 'actions/delete.svg'); ?>" title="<?php echo $l->t('Delete contact');?>" />
 
 	<?php if(isset($_['details']['PHOTO'])): // Emails first ?>
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index c175142319f..8d589ea5e2e 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -5,6 +5,7 @@ require_once('apps/files_sharing/sharedstorage.php');
 OC::$CLASSPATH['OC_Share'] = "apps/files_sharing/lib_share.php";
 OC_Hook::connect("OC_Filesystem", "post_delete", "OC_Share", "deleteItem");
 OC_Hook::connect("OC_Filesystem", "post_rename", "OC_Share", "renameItem");
+OC_Hook::connect("OC_Filesystem", "post_write", "OC_Share", "updateItem");
 OC_Filesystem::registerStorageType("shared", "OC_Filestorage_Shared", array("datadir" => "string"));
 OC_Util::addScript("files_sharing", "share");
 OC_Util::addScript("3rdparty", "chosen/chosen.jquery.min");
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index cde33fd1dc5..0eb0e5bf85d 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -91,6 +91,9 @@ class OC_Share {
 				// Clear the folder size cache for the 'Shared' folder
 				$clearFolderSize = OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
 				$clearFolderSize->execute(array($sharedFolder));
+				// Emit post_create and post_write hooks to notify of a new file in the user's filesystem
+				OC_Hook::emit("OC_Filesystem", "post_create", array('path' => $target));
+				OC_Hook::emit("OC_Filesystem", "post_write", array('path' => $target));
 			}
 		}
 	}
@@ -263,6 +266,18 @@ class OC_Share {
 		}
 	}
 
+	public static function getTarget($source) {
+		$source = self::cleanPath($source);
+		$query = OC_DB::prepare("SELECT target FROM *PREFIX*sharing WHERE source = ? AND uid_owner = ? LIMIT 1");
+		$result = $query->execute(array($source, OC_User::getUser()))->fetchAll();
+		if (count($result) > 0) {
+			return $result[0]['target'];
+		} else {
+			// TODO Check in folders
+			return false;
+		}
+	}
+
 	/**
 	 * Get the user's permissions for the item at the specified target location
 	 * @param $target The target location of the item
@@ -380,8 +395,13 @@ class OC_Share {
 	*/
 	public static function deleteItem($arguments) {
 		$source = "/".OC_User::getUser()."/files".self::cleanPath($arguments['path']);
-		$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
-		$query->execute(array(strlen($source), $source, OC_User::getUser()));
+		if ($target = self::getTarget($source)) {
+			// Forward hook to notify of changes to target file
+			OC_Hook::emit("OC_Filesystem", "post_delete", array('path' => $target));
+			$query = OC_DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
+			$query->execute(array(strlen($source), $source, OC_User::getUser()));
+		}
+		
 	}
 
 	/**
@@ -395,6 +415,14 @@ class OC_Share {
 		$query->execute(array($oldSource, $newSource, OC_User::getUser()));
 	}
 
+	public static function updateItem($arguments) {
+		$source = "/".OC_User::getUser()."/files".self::cleanPath($arguments['path']);
+		if ($target = self::getTarget($source)) {
+			// Forward hook to notify of changes to target file
+			OC_Hook::emit("OC_Filesystem", "post_write", array('path' => $target));
+		}
+	}
+
 }
 
 ?>
diff --git a/apps/gallery/l10n/ca.php b/apps/gallery/l10n/ca.php
new file mode 100644
index 00000000000..f3eb40df553
--- /dev/null
+++ b/apps/gallery/l10n/ca.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galeria",
+"Rescan" => "Escaneja de nou",
+"Back" => "Enrera"
+);
diff --git a/apps/gallery/l10n/de.php b/apps/gallery/l10n/de.php
index 4ca5c83249c..b7f1934189a 100644
--- a/apps/gallery/l10n/de.php
+++ b/apps/gallery/l10n/de.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-  "Gallery" => "Galerie",
-  "Back" => "Zurück"
+"Gallery" => "Galerie",
+"Rescan" => "Rescan",
+"Back" => "Zurück"
 );
-?>
diff --git a/apps/gallery/l10n/fr.php b/apps/gallery/l10n/fr.php
new file mode 100644
index 00000000000..17902bd70c9
--- /dev/null
+++ b/apps/gallery/l10n/fr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galerie",
+"Rescan" => "Analyser à nouveau",
+"Back" => "Retour"
+);
diff --git a/apps/gallery/l10n/gl.php b/apps/gallery/l10n/gl.php
new file mode 100644
index 00000000000..b4f9885a525
--- /dev/null
+++ b/apps/gallery/l10n/gl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galería",
+"Rescan" => "Voltar a analizar",
+"Back" => "Atrás"
+);
diff --git a/apps/gallery/l10n/it.php b/apps/gallery/l10n/it.php
new file mode 100644
index 00000000000..0f95cc3af66
--- /dev/null
+++ b/apps/gallery/l10n/it.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galleria",
+"Rescan" => "Rileggi",
+"Back" => "Indietro"
+);
diff --git a/apps/gallery/l10n/sk_SK.php b/apps/gallery/l10n/sk_SK.php
new file mode 100644
index 00000000000..d8ae41af96e
--- /dev/null
+++ b/apps/gallery/l10n/sk_SK.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Galéria",
+"Rescan" => "Znovu oskenovať",
+"Back" => "Späť"
+);
diff --git a/apps/gallery/l10n/sr.php b/apps/gallery/l10n/sr.php
new file mode 100644
index 00000000000..c6976b56a9f
--- /dev/null
+++ b/apps/gallery/l10n/sr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "Галерија",
+"Rescan" => "Претражи поново",
+"Back" => "Назад"
+);
diff --git a/apps/gallery/l10n/zh_CN.php b/apps/gallery/l10n/zh_CN.php
new file mode 100644
index 00000000000..c506600c4c0
--- /dev/null
+++ b/apps/gallery/l10n/zh_CN.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Gallery" => "画廊",
+"Rescan" => "重新扫描",
+"Back" => "返回"
+);
diff --git a/apps/gallery/templates/view_album.php b/apps/gallery/templates/view_album.php
index 7e3a67df4e4..55a2ee09e4a 100644
--- a/apps/gallery/templates/view_album.php
+++ b/apps/gallery/templates/view_album.php
@@ -16,7 +16,7 @@ $l = new OC_L10N('gallery');
 </script>
 
 <div id="controls">
-  <a href="?"><input type="button" value="<? echo $l->t('Back');?>" /></a>
+  <a href="?"><input type="button" value="<?php echo $l->t('Back');?>" /></a>
 <br/>
 </div>
 
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
index 93298c82c55..4a93e84910e 100644
--- a/apps/media/ajax/api.php
+++ b/apps/media/ajax/api.php
@@ -23,9 +23,6 @@
 
 header('Content-type: text/html; charset=UTF-8') ;
 
-//no apps
-$RUNTIME_NOAPPS=true;
-
 require_once('../../../lib/base.php');
 OC_JSON::checkAppEnabled('media');
 require_once('../lib_collection.php');
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index da0407fca58..bcd8cf9178b 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -8,7 +8,6 @@ a.jp-next { left:5em; }
 div.jp-progress { position:absolute; overflow:hidden; top:.5em; left:8em; width:15em; height:1.2em; padding:0; }
 div.jp-seek-bar { background:#eee; width:0; height:100%; cursor:pointer; }
 div.jp-play-bar { background:#ccc; width:0; height:100%; }
-div.jp-seeking-bg { background:url("../img/pbar-ani.gif"); }
 div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:0.9em; left:13.5em; }
 div.jp-duration { display: none }
 div.jp-current-song { left: 33em; position: absolute; top: 0.9em; }
diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
index dff4163897f..055f858ae16 100644
--- a/apps/media/js/loader.js
+++ b/apps/media/js/loader.js
@@ -52,10 +52,8 @@ $(document).ready(function() {
 	}
 	var oc_current_user=OC.currentUser;
 	if(typeof PlayList==='undefined'){
-		if(typeof localStorage !== 'undefined' && localStorage){
-			if(localStorage.getItem(oc_current_user+'oc_playlist_items') && localStorage.getItem(oc_current_user+'oc_playlist_items')!='[]' && localStorage.getItem(oc_current_user+'oc_playlist_active')!='true'){
-				loadPlayer();
-			}
+		if(OC.localStorage.getItem('playlist_items') && OC.localStorage.getItem('playlist_items').length && OC.localStorage.getItem('playlist_active')!=true){
+			loadPlayer();
 		}
 	}
 });
\ No newline at end of file
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index 1f76356fd97..ad406830833 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -34,7 +34,7 @@ var PlayList={
 			if(PlayList.player){
 				if(PlayList.player.data('jPlayer').options.supplied!=items[index].type){//the the audio type changes we need to reinitialize jplayer
 					PlayList.player.jPlayer("play",time);
-					localStorage.setItem(oc_current_user+'oc_playlist_time',time);
+					OC.localStorage.setItem('playlist_time',time);
 					PlayList.player.jPlayer("destroy");
 // 					PlayList.save(); // so that the init don't lose the playlist
 					PlayList.init(items[index].type,null); // init calls load that calls play
@@ -64,9 +64,8 @@ var PlayList={
 					}
 				}
 			}else{
-				localStorage.setItem(oc_current_user+'oc_playlist_time',time);
-				localStorage.setItem(oc_current_user+'oc_playlist_playing','true');
-//                 PlayList.save(); // so that the init don't lose the playlist
+				OC.localStorage.setItem('playlist_time',time);
+				OC.localStorage.setItem('playlist_playing',true);
 				PlayList.init(items[index].type,null); // init calls load that calls play
 			}
 		}
@@ -92,11 +91,11 @@ var PlayList={
 		$(PlayList.player).jPlayer({
 			ended:PlayList.next,
 			pause:function(){
-				localStorage.setItem(oc_current_user+'oc_playlist_playing','false');
+				OC.localStorage.setItem('playlist_playing',false);
 				document.title = "ownCloud";
 			},
 			play:function(event){
-				localStorage.setItem(oc_current_user+'oc_playlist_playing','true');
+				OC.localStorage.setItem('playlist_playing',true);
 				document.title = "\u25b8 " + event.jPlayer.status.media.name + " - " + event.jPlayer.status.media.artist + " - ownCloud";
 			},
 			supplied:type,
@@ -161,46 +160,42 @@ var PlayList={
 		}
 	},
 	save:function(){
-		if(typeof localStorage !== 'undefined' && localStorage){
-			localStorage.setItem(oc_current_user+'oc_playlist_items',JSON.stringify(PlayList.items));
-			localStorage.setItem(oc_current_user+'oc_playlist_current',PlayList.current);
-			if(PlayList.player) {
-				if(PlayList.player.data('jPlayer')) {
-					var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
-					localStorage.setItem(oc_current_user+'oc_playlist_time',time);
-					var volume=PlayList.player.data('jPlayer').options.volume*100;
-					localStorage.setItem(oc_current_user+'oc_playlist_volume',volume);
-				}
+		OC.localStorage.setItem('playlist_items',PlayList.items);
+		OC.localStorage.setItem('playlist_current',PlayList.current);
+		if(PlayList.player) {
+			if(PlayList.player.data('jPlayer')) {
+				var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
+				OC.localStorage.setItem('playlist_time',time);
+				var volume=PlayList.player.data('jPlayer').options.volume*100;
+				OC.localStorage.setItem('playlist_volume',volume);
 			}
-			localStorage.setItem(oc_current_user+'oc_playlist_active','true');
 		}
+		OC.localStorage.setItem('playlist_active',true);
 	},
 	load:function(){
-		if(typeof localStorage !== 'undefined' && localStorage){
-			PlayList.active=true;
-			localStorage.setItem(oc_current_user+'oc_playlist_active','true');
-			if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_items')){
-				PlayList.items=JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_items'));
-				if(PlayList.items.length>0){
-					PlayList.current=parseInt(localStorage.getItem(oc_current_user+'oc_playlist_current'));
-					var time=parseInt(localStorage.getItem(oc_current_user+'oc_playlist_time'));
-					if(localStorage.hasOwnProperty(oc_current_user+'oc_playlist_volume')){
-						var volume=localStorage.getItem(oc_current_user+'oc_playlist_volume');
-						PlayList.volume=volume/100;
-						$('.jp-volume-bar-value').css('width',volume+'%');
-						if(PlayList.player.data('jPlayer')){
-							PlayList.player.jPlayer("option",'volume',volume/100);
-						}
-					}
-					if(JSON.parse(localStorage.getItem(oc_current_user+'oc_playlist_playing'))){
-						PlayList.play(null,time);
-					}else{
-						PlayList.play(null,time,function(){
-							PlayList.player.jPlayer("pause");
-						});
+		PlayList.active=true;
+		OC.localStorage.setItem('playlist_active',true);
+		if(OC.localStorage.hasItem('playlist_items')){
+			PlayList.items=OC.localStorage.getItem('playlist_items');
+			if(PlayList.items && PlayList.items.length>0){
+				PlayList.current=OC.localStorage.getItem('playlist_current');
+				var time=OC.localStorage.getItem('playlist_time');
+				if(OC.localStorage.hasItem('playlist_volume')){
+					var volume=OC.localStorage.getItem('playlist_volume');
+					PlayList.volume=volume/100;
+					$('.jp-volume-bar-value').css('width',volume+'%');
+					if(PlayList.player.data('jPlayer')){
+						PlayList.player.jPlayer("option",'volume',volume/100);
 					}
-					PlayList.render();
 				}
+				if(OC.localStorage.getItem('playlist_playing')){
+					PlayList.play(null,time);
+				}else{
+					PlayList.play(null,time,function(){
+						PlayList.player.jPlayer("pause");
+					});
+				}
+				PlayList.render();
 			}
 		}
 	}
@@ -210,7 +205,7 @@ $(document).ready(function(){
 	$(window).bind('beforeunload', function (){
 		PlayList.save();
 		if(PlayList.active){
-			localStorage.setItem(oc_current_user+'oc_playlist_active','false');
+			OC.localStorage.setItem('playlist_active',false);
 		}
 	});
 
diff --git a/apps/media/l10n/gl.php b/apps/media/l10n/gl.php
new file mode 100644
index 00000000000..b2d0bc78355
--- /dev/null
+++ b/apps/media/l10n/gl.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Música",
+"Play" => "Reproducir",
+"Pause" => "Pausa",
+"Previous" => "Anterior",
+"Next" => "Seguinte",
+"Mute" => "Silenciar",
+"Unmute" => "Restaurar volume",
+"Rescan Collection" => "Voltar a analizar a Colección",
+"Artist" => "Artista",
+"Album" => "Album",
+"Title" => "Título"
+);
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 485d616e1aa..0ade0e593dc 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -28,7 +28,7 @@ OC_Hook::connect('OC_User','post_login','OC_MEDIA','loginListener');
 OC_Hook::connect('OC_Filesystem','post_write','OC_MEDIA','updateFile');
 
 //listen for file deletions to clean the database if a song is deleted
-OC_Hook::connect('OC_Filesystem','delete','OC_MEDIA','deleteFile');
+OC_Hook::connect('OC_Filesystem','post_delete','OC_MEDIA','deleteFile');
 
 //list for file moves to update the database
 OC_Hook::connect('OC_Filesystem','post_rename','OC_MEDIA','moveFile');