Merge branch 'master' into encryption_work_with_public_gallery

29 files changed, 100 insertions, 81 deletions

diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index f7734b0d0e1..b00a43c5ce9 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Accés prohibit",
 "Cloud not found" => "No s'ha trobat el núvol",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho a: %s\n\n",
-"The share will expire on %s.\n\n" => "El compartit té venciment a %s.\n\n",
 "Cheers!" => "Salut!",
 "Security Warning" => "Avís de seguretat",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versió de PHP que useu és vulnerable a l'atac per NULL Byte (CVE-2006-7243)",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "Log in" => "Inici de sessió",
 "Alternative Logins" => "Acreditacions alternatives",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ei,<br><br>només fer-te saber que %s ha compartit »%s« amb tu.<br><a href=\"%s\">Mira-ho!</a><br><br>",
-"The share will expire on %s.<br><br>" => "El compartit té venciment a %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "S'està actualitzant ownCloud a la versió %s, pot trigar una estona.",
 "This ownCloud instance is currently being updated, which may take a while." => "Aquesta instància d'ownCloud s'està actualitzant i podria trigar una estona.",
 "Please reload this page after a short time to continue using ownCloud." => "Carregueu de nou aquesta pàgina d'aquí a poc temps per continuar usant ownCloud.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index f2bbec30d62..0e3c6bf27fb 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -129,7 +129,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Přístup zakázán",
 "Cloud not found" => "Cloud nebyl nalezen",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej ty tam,\n\njen ti chci dát vědět, že %s sdílel %s s tebou.\nZobraz si to: %s\n\n",
-"The share will expire on %s.\n\n" => "Sdílení expiruje %s.\n\n",
 "Cheers!" => "Ať slouží!",
 "Security Warning" => "Bezpečnostní upozornění",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verze vašeho PHP je napadnutelná pomocí techniky \"NULL Byte\" (CVE-2006-7243)",
@@ -162,7 +161,6 @@ $TRANSLATIONS = array(
 "Log in" => "Přihlásit",
 "Alternative Logins" => "Alternativní přihlášení",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej ty tam,<br><br>jen ti chci dát vědět, že %s sdílel »%s« s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Sdílení expiruje %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvíli trvat."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/da.php b/core/l10n/da.php
index ff41ecb13f4..88348fe39e0 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Adgang forbudt",
 "Cloud not found" => "Sky ikke fundet",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej med dig\n\nDette blot for at lade dig vide, at %s har delt %s med dig.\nSe det her: %s\n\n",
-"The share will expire on %s.\n\n" => "Det delte link vil udløbe d. %s.⏎\n⏎\n",
 "Cheers!" => "Hej!",
 "Security Warning" => "Sikkerhedsadvarsel",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din PHP-version er sårbar overfor et NULL Byte angreb (CVE-2006-7243)",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "Log in" => "Log ind",
 "Alternative Logins" => "Alternative logins",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej med dig,<br><br>Dette blot for at lade dig vide, at %s har delt \"%s\" med dig.<br><a href=\"%s\">Se det her!</a><br><br>Hej",
-"The share will expire on %s.<br><br>" => "Det delte link vil udløbe d. %s.",
 "Updating ownCloud to version %s, this may take a while." => "Opdatere Owncloud til version %s, dette kan tage et stykke tid.",
 "This ownCloud instance is currently being updated, which may take a while." => "Opdatere Owncloud, dette kan tage et stykke tid.",
 "Please reload this page after a short time to continue using ownCloud." => "Genindlæs denne side efter kort tid til at fortsætte med at bruge ownCloud.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 494764f97cd..32392386426 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -100,7 +100,7 @@ $TRANSLATIONS = array(
 "Delete" => "Löschen",
 "Add" => "Hinzufügen",
 "Edit tags" => "Schlagwörter bearbeiten",
-"Error loading dialog template: {error}" => "Fehler beim Laden der Gesprächsvorlage: {error}",
+"Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}",
 "No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melde dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Du wirst nun zu ownCloud weitergeleitet.",
@@ -132,7 +132,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud nicht gefunden",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
-"The share will expire on %s.\n\n" => "Die Freigabe wird ablaufen am %s.\n\n",
+"The share will expire on %s." => "Die Freigabe wird am %s ablaufen.",
 "Cheers!" => "Hallo!",
 "Security Warning" => "Sicherheitswarnung",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
@@ -165,7 +165,6 @@ $TRANSLATIONS = array(
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br/><br/>wollte dich nur kurz informieren, dass %s gerade %s mit dir geteilt hat.<br/><a href=\"%s\">Schau es dir an.</a><br/><br/>",
-"The share will expire on %s.<br><br>" => "Die Freigabe wird ablaufen am %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
 "This ownCloud instance is currently being updated, which may take a while." => "Diese OwnCloud-Instanz wird gerade aktualisiert, was eine Weile dauert.",
 "Please reload this page after a short time to continue using ownCloud." => "Bitte lade diese Seite nach kurzer Zeit neu, um mit der Nutzung von OwnCloud fortzufahren.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 8832aad32b4..af76319eb7f 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,12 +1,12 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "%s geteilt »%s« mit Ihnen",
-"Couldn't send mail to following users: %s " => "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
+"Couldn't send mail to following users: %s " => "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
 "Turned on maintenance mode" => "Wartungsmodus eingeschaltet ",
 "Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
 "Updated database" => "Datenbank aktualisiert",
-"Updating filecache, this may take really long..." => "Aktualisiere Dateicache, dies könnte eine Weile dauern...",
-"Updated filecache" => "Dateicache aktualisiert",
+"Updating filecache, this may take really long..." => "Aktualisiere Datei-Cache, dies könnte eine Weile dauern...",
+"Updated filecache" => "Datei-Cache aktualisiert",
 "... %d%% done ..." => "... %d%% erledigt ...",
 "No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt",
 "Unknown filetype" => "Unbekannter Dateityp",
@@ -53,7 +53,7 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
 "One file conflict" => "Ein Dateikonflikt",
 "Which files do you want to keep?" => "Welche Dateien möchten Sie behalten?",
-"If you select both versions, the copied file will have a number added to its name." => "Wenn Siebeide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+"If you select both versions, the copied file will have a number added to its name." => "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
 "Cancel" => "Abbrechen",
 "Continue" => "Fortsetzen",
 "(all selected)" => "(Alle ausgewählt)",
@@ -100,7 +100,7 @@ $TRANSLATIONS = array(
 "Delete" => "Löschen",
 "Add" => "Hinzufügen",
 "Edit tags" => "Schlagwörter bearbeiten",
-"Error loading dialog template: {error}" => "Fehler beim Laden der Gesprächsvorlage: {error}",
+"Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}",
 "No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Community</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
@@ -131,16 +131,16 @@ $TRANSLATIONS = array(
 "Error unfavoriting" => "Fehler beim Entfernen aus den Favoriten",
 "Access forbidden" => "Zugriff verboten",
 "Cloud not found" => "Cloud wurde nicht gefunden",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\nich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.\nSchauen Sie es sich an: %s\n\n",
-"The share will expire on %s.\n\n" => "Die Freigabe wird ablaufen am %s.\n\n",
-"Cheers!" => "Hallo!",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s hat %s mit Ihnen geteilt.\nSchauen Sie es sich an: %s\n\n",
+"The share will expire on %s." => "Die Freigabe wird am %s ablaufen.",
+"Cheers!" => "Noch einen schönen Tag!",
 "Security Warning" => "Sicherheitshinweis",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
 "Please update your PHP installation to use %s securely." => "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktivieren Sie die PHP-Erweiterung für OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Ohne einen sicheren Zufallszahlengenerator sind Angreifer in der Lage, die Tokens für das Zurücksetzen der Passwörter vorherzusehen und Ihr Konto zu übernehmen.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihr Server richtig konfigurieren können.",
 "Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
 "Advanced" => "Fortgeschritten",
 "Data folder" => "Datenverzeichnis",
@@ -158,17 +158,16 @@ $TRANSLATIONS = array(
 "Automatic logon rejected!" => "Automatische Anmeldung verweigert!",
 "If you did not change your password recently, your account may be compromised!" => "Wenn Sie Ihr Passwort nicht vor kurzem geändert haben, könnte Ihr\nAccount kompromittiert sein!",
 "Please change your password to secure your account again." => "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern.",
-"Server side authentication failed!" => "Serverseitige Authentifizierung fehlgeschlagen!",
+"Server side authentication failed!" => "Die Authentifizierung auf dem Server ist fehlgeschlagen!",
 "Please contact your administrator." => "Bitte kontaktieren Sie Ihren Administrator.",
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
 "Alternative Logins" => "Alternative Logins",
-"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>ich wollte Sie nur wissen lassen, dass %s %s mit Ihnen teilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Die Freigabe wird ablaufen am %s.<br><br>",
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>%s hat %s mit Ihnen geteilt.<br><a href=\"%s\">Schauen Sie es sich an!</a><br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies könnte eine Weile dauern.",
-"This ownCloud instance is currently being updated, which may take a while." => "Diese OwnCloud-Instanz wird gerade aktualisiert, was eine Weile dauert.",
-"Please reload this page after a short time to continue using ownCloud." => "Bitte laden Sie diese Seite nach kurzer Zeit neu, um mit der Nutzung von OwnCloud fortzufahren.",
+"This ownCloud instance is currently being updated, which may take a while." => "Diese ownCloud-Instanz wird gerade aktualisiert, was eine Weile dauert.",
+"Please reload this page after a short time to continue using ownCloud." => "Bitte laden Sie diese Seite nach kurzer Zeit neu, um mit der Nutzung von ownCloud fortzufahren.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
 "Thank you for your patience." => "Vielen Dank für Ihre Geduld."
 );
diff --git a/core/l10n/el.php b/core/l10n/el.php
index c379881caed..dc196486e64 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -1,9 +1,11 @@
 <?php
 $TRANSLATIONS = array(
 "%s shared »%s« with you" => "Ο %s διαμοιράστηκε μαζί σας το »%s«",
+"Couldn't send mail to following users: %s " => "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
 "Turned on maintenance mode" => "Η κατάσταση συντήρησης ενεργοποιήθηκε",
 "Turned off maintenance mode" => "Η κατάσταση συντήρησης απενεργοποιήθηκε",
 "Updated database" => "Ενημερωμένη βάση δεδομένων",
+"No image or file provided" => "Δεν δόθηκε εικόνα ή αρχείο",
 "Unknown filetype" => "Άγνωστος τύπος αρχείου",
 "Invalid image" => "Μη έγκυρη εικόνα",
 "Sunday" => "Κυριακή",
@@ -27,7 +29,7 @@ $TRANSLATIONS = array(
 "December" => "Δεκέμβριος",
 "Settings" => "Ρυθμίσεις",
 "seconds ago" => "δευτερόλεπτα πριν",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
+"_%n minute ago_::_%n minutes ago_" => array("%n λεπτό πριν","%n λεπτά πριν"),
 "_%n hour ago_::_%n hours ago_" => array("",""),
 "today" => "σήμερα",
 "yesterday" => "χτες",
@@ -42,8 +44,11 @@ $TRANSLATIONS = array(
 "No" => "Όχι",
 "Ok" => "Οκ",
 "_{count} file conflict_::_{count} file conflicts_" => array("",""),
+"Which files do you want to keep?" => "Ποια αρχεία θέλετε να κρατήσετε;",
+"If you select both versions, the copied file will have a number added to its name." => "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο.",
 "Cancel" => "Άκυρο",
 "Continue" => "Συνέχεια",
+"(all selected)" => "(όλα τα επιλεγμένα)",
 "Shared" => "Κοινόχρηστα",
 "Share" => "Διαμοιρασμός",
 "Error" => "Σφάλμα",
@@ -107,6 +112,7 @@ $TRANSLATIONS = array(
 "Tag already exists" => "Υπάρχει ήδη η ετικέτα",
 "Access forbidden" => "Δεν επιτρέπεται η πρόσβαση",
 "Cloud not found" => "Δεν βρέθηκε νέφος",
+"The share will expire on %s." => "Ο διαμοιρασμός θα λήξει σε %s.",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Η PHP ειναι ευαλωτη στην NULL Byte επιθεση (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Παρακαλώ ενημερώστε την εγκατάσταση της PHP ώστε να χρησιμοποιήσετε το %s με ασφάλεια.",
@@ -125,16 +131,21 @@ $TRANSLATIONS = array(
 "Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων",
 "Database host" => "Διακομιστής βάσης δεδομένων",
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
+"Finishing …" => "Ολοκλήρωση...",
 "%s is available. Get more information on how to update." => "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
 "Log out" => "Αποσύνδεση",
 "Automatic logon rejected!" => "Απορρίφθηκε η αυτόματη σύνδεση!",
 "If you did not change your password recently, your account may be compromised!" => "Εάν δεν αλλάξατε το συνθηματικό σας προσφάτως, ο λογαριασμός μπορεί να έχει διαρρεύσει!",
 "Please change your password to secure your account again." => "Παρακαλώ αλλάξτε το συνθηματικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας.",
+"Server side authentication failed!" => "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
+"Please contact your administrator." => "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
 "Lost your password?" => "Ξεχάσατε το συνθηματικό σας;",
 "remember" => "απομνημόνευση",
 "Log in" => "Είσοδος",
 "Alternative Logins" => "Εναλλακτικές Συνδέσεις",
 "Updating ownCloud to version %s, this may take a while." => "Ενημερώνοντας το ownCloud στην έκδοση %s,μπορεί να πάρει λίγο χρόνο.",
+"Please reload this page after a short time to continue using ownCloud." => "Παρακαλώ ανανεώστε αυτή τη σελίδα μετά από ένα σύντομο χρονικό διάστημα ώστε να συνεχίσετε να χρησιμοποιείτε το ownCloud.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.",
 "Thank you for your patience." => "Σας ευχαριστούμε για την υπομονή σας."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 7ead84a8746..1ad9031e755 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -132,7 +132,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Access denied",
 "Cloud not found" => "Cloud not found",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
-"The share will expire on %s.\n\n" => "The share will expire on %s.\n\n",
+"The share will expire on %s." => "The share will expire on %s.",
 "Cheers!" => "Cheers!",
 "Security Warning" => "Security Warning",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
@@ -165,7 +165,6 @@ $TRANSLATIONS = array(
 "Log in" => "Log in",
 "Alternative Logins" => "Alternative Logins",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>",
-"The share will expire on %s.<br><br>" => "The share will expire on %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Updating ownCloud to version %s, this may take a while.",
 "This ownCloud instance is currently being updated, which may take a while." => "This ownCloud instance is currently being updated, which may take a while.",
 "Please reload this page after a short time to continue using ownCloud." => "Please reload this page after a short time to continue using ownCloud.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index f938218d43d..df765ab2127 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "No se encuentra la nube",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
-"The share will expire on %s.\n\n" => "El objeto dejará de ser compartido el %s.\n\n",
 "Cheers!" => "¡Saludos!",
 "Security Warning" => "Advertencia de seguridad",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "Log in" => "Entrar",
 "Alternative Logins" => "Inicios de sesión alternativos",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hola:<br><br>tan solo queremos informarte que %s compartió «%s» contigo.<br><a href=\"%s\">¡Míralo acá!</a><br><br>",
-"The share will expire on %s.<br><br>" => "El objeto dejará de ser compartido el %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versión %s, esto puede demorar un tiempo.",
 "This ownCloud instance is currently being updated, which may take a while." => "Esta versión de owncloud se está actualizando, esto puede demorar un tiempo.",
 "Please reload this page after a short time to continue using ownCloud." => "Por favor , recargue esta instancia de onwcloud tras un corto periodo de tiempo y continue usándolo.",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index b56038a2125..c12a1c66315 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -132,7 +132,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Ligipääs on keelatud",
 "Cloud not found" => "Pilve ei leitud",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei,\n\nlihtsalt annan sulle teada, et %s jagas sulle välja %s.\nVaata seda: %s\n\n",
-"The share will expire on %s.\n\n" => "Jagamine aegub %s.\n\n",
+"The share will expire on %s." => "Jagamine aegub %s.",
 "Cheers!" => "Terekest!",
 "Security Warning" => "Turvahoiatus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
@@ -165,7 +165,6 @@ $TRANSLATIONS = array(
 "Log in" => "Logi sisse",
 "Alternative Logins" => "Alternatiivsed sisselogimisviisid",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei,<br><br>lihtsalt annan sulle teada, et %s jagas sulle välja »%s«.<br><a href=\"%s\">Vaata seda!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Jagamine aegub %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "ownCloudi uuendamine versioonile %s. See võib veidi aega võtta.",
 "This ownCloud instance is currently being updated, which may take a while." => "Seda ownCloud instantsi hetkel uuendatakse, võib võtta veidi aega.",
 "Please reload this page after a short time to continue using ownCloud." => "Palun laadi see leht uuesti veidi aja pärast jätkamaks ownCloud kasutamist.",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 3462ab5c983..5e7a65d609e 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -121,7 +121,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Pääsy estetty",
 "Cloud not found" => "Pilveä ei löydy",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
-"The share will expire on %s.\n\n" => "Jakaminen päättyy %s.\n\n",
+"The share will expire on %s." => "Jakaminen päättyy %s.",
 "Security Warning" => "Turvallisuusvaroitus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.",
@@ -152,8 +152,9 @@ $TRANSLATIONS = array(
 "Log in" => "Kirjaudu sisään",
 "Alternative Logins" => "Vaihtoehtoiset kirjautumiset",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hei sinä!<br><br>%s jakoi kohteen »%s« kanssasi.<br><a href=\"%s\">Tutustu siihen!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Jakaminen päättyy %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Päivitetään ownCloud versioon %s, tämä saattaa kestää hetken.",
+"This ownCloud instance is currently being updated, which may take a while." => "Tätä ownCloud-asennusta päivitetään parhaillaan, siinä saattaa kestää hetki.",
+"Please reload this page after a short time to continue using ownCloud." => "Päivitä tämä sivu hetken kuluttua jatkaaksesi ownCloudin käyttämistä.",
 "Thank you for your patience." => "Kiitos kärsivällisyydestäsi."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 624dd54575f..7668f589a85 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Accès interdit",
 "Cloud not found" => "Introuvable",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Bonjour,\n\nJuste pour vous signaler que %s a partagé %s avec vous.\nConsultez-le : %s\n",
-"The share will expire on %s.\n\n" => "Le partage expire le %s.\n\n",
 "Cheers!" => "Salutations!",
 "Security Warning" => "Avertissement de sécurité",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "Log in" => "Connexion",
 "Alternative Logins" => "Logins alternatifs",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Bonjour,<br><br>Juste pour vous informer que %s a partagé »%s« avec vous.<br><a href=\"%s\">Consultez-le !</a><br><br>",
-"The share will expire on %s.<br><br>" => "Le partage expirera le %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Mise à jour en cours d'ownCloud vers la version %s, cela peut prendre du temps.",
 "This ownCloud instance is currently being updated, which may take a while." => "Cette instance d'ownCloud est en cours de mise à jour, cela peut prendre du temps.",
 "Please reload this page after a short time to continue using ownCloud." => "Merci de recharger cette page après un moment pour continuer à utiliser ownCloud.",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index 6a5c5ed56e8..94a4b47b9c5 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -132,7 +132,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Acceso denegado",
 "Cloud not found" => "Nube non atopada",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n",
-"The share will expire on %s.\n\n" => "Esta compartición caduca o %s.\n\n",
+"The share will expire on %s." => "Esta compartición caduca o %s.",
 "Cheers!" => "Saúdos!",
 "Security Warning" => "Aviso de seguranza",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
@@ -165,7 +165,6 @@ $TRANSLATIONS = array(
 "Log in" => "Conectar",
 "Alternative Logins" => "Accesos alternativos",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ola,<br><br>Só facerlle saber que %s compartiu «%s» con vostede.<br><a href=\"%s\">Véxao!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Esta compartición caduca o %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a versión %s,  esto pode levar un anaco.",
 "This ownCloud instance is currently being updated, which may take a while." => "Esta instancia do ownCloud está actualizandose neste momento, pode levarlle un chisco.",
 "Please reload this page after a short time to continue using ownCloud." => "Volva cargar a páxina de aquí a pouco para para continuar co ownCloud.",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index 7a8cdee9256..7c67bb9d22c 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "A hozzáférés nem engedélyezett",
 "Cloud not found" => "A felhő nem található",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Szia!\\n\n\\n\nÉrtesítünk, hogy %s megosztotta veled a következőt: %s.\\n\nItt tudod megnézni: %s\\n\n\\n",
-"The share will expire on %s.\n\n" => "A megosztás ekkor jár le: %s\\n\n\\n",
 "Cheers!" => "Üdv.",
 "Security Warning" => "Biztonsági figyelmeztetés",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "Log in" => "Bejelentkezés",
 "Alternative Logins" => "Alternatív bejelentkezés",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Szia!<br><br>Értesítünk, hogy %s megosztotta veled a következőt: »%s«.<br><a href=\"%s\">Ide kattintva tudod megnézni</a><br><br>",
-"The share will expire on %s.<br><br>" => "A megosztás ekkor jár le: %s<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud frissítés a %s verzióra folyamatban. Kis türelmet.",
 "This ownCloud instance is currently being updated, which may take a while." => "Az Owncloud frissítés elezdődött, eltarthat egy ideig.",
 "Please reload this page after a short time to continue using ownCloud." => "Frissitsd az oldalt ha \"Please reload this page after a short time to continue using ownCloud. \"",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 353bbe0705f..80536e2dbe5 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Accesso negato",
 "Cloud not found" => "Nuvola non trovata",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n",
-"The share will expire on %s.\n\n" => "La condivisione scadrà il %s.\n\n",
 "Cheers!" => "Saluti!",
 "Security Warning" => "Avviso di sicurezza",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "Log in" => "Accedi",
 "Alternative Logins" => "Accessi alternativi",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ciao,<br><br>volevo informarti che %s ha condiviso %s con te.<br><a href=\"%s\">Vedi!</a><br><br>",
-"The share will expire on %s.<br><br>" => "La condivisione scadrà il %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, ciò potrebbe richiedere del tempo.",
 "This ownCloud instance is currently being updated, which may take a while." => "Questa istanza di ownCloud è in fase di aggiornamento, potrebbe richiedere del tempo.",
 "Please reload this page after a short time to continue using ownCloud." => "Ricarica questa pagina per poter continuare ad usare ownCloud.",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 6b525223e9c..f43e6083d0c 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "アクセスが禁止されています",
 "Cloud not found" => "見つかりません",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n",
-"The share will expire on %s.\n\n" => "共有は %s で有効期限が切れます。\n\n",
 "Cheers!" => "それでは！",
 "Security Warning" => "セキュリティ警告",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
@@ -161,11 +160,10 @@ $TRANSLATIONS = array(
 "Server side authentication failed!" => "サーバサイドの認証に失敗しました！",
 "Please contact your administrator." => "管理者に問い合わせてください。",
 "Lost your password?" => "パスワードを忘れましたか？",
-"remember" => "パスワードを記憶する",
+"remember" => "自動ログインする",
 "Log in" => "ログイン",
 "Alternative Logins" => "代替ログイン",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
-"The share will expire on %s.<br><br>" => "共有は %s で有効期限が切れます。<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "ownCloud をバージョン %s に更新しています、しばらくお待ち下さい。",
 "This ownCloud instance is currently being updated, which may take a while." => "この ownCloud インスタンスは現在更新中であり、しばらく時間がかかります。",
 "Please reload this page after a short time to continue using ownCloud." => "ownCloud を続けて利用するには、しばらくした後でページをリロードしてください。",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index f7fc7203bb8..bed1756cb49 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -129,7 +129,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Priėjimas draudžiamas",
 "Cloud not found" => "Negalima rasti",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
-"The share will expire on %s.\n\n" => "Bendrinimo laikas baigsis %s.\n",
 "Cheers!" => "Sveikinimai!",
 "Security Warning" => "Saugumo pranešimas",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
@@ -162,7 +161,6 @@ $TRANSLATIONS = array(
 "Log in" => "Prisijungti",
 "Alternative Logins" => "Alternatyvūs prisijungimai",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Labas,<br><br>tik informuojame, kad %s pasidalino su Jumis »%s«.<br><a href=\"%s\">Peržiūrėk!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Bendrinimo laikas baigsis %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Atnaujinama ownCloud į %s versiją. tai gali šiek tiek užtrukti.",
 "This ownCloud instance is currently being updated, which may take a while." => "Šiuo metu vyksta ownCloud atnaujinamas, tai gali šiek tiek užtrukti.",
 "Please reload this page after a short time to continue using ownCloud." => "Po trupučio laiko atnaujinkite šį puslapį kad galėtumėte toliau naudoti ownCloud.",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 62d319a65ea..bc40a6c2ffc 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -115,7 +115,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Забранет пристап",
 "Cloud not found" => "Облакот не е најден",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n",
-"The share will expire on %s.\n\n" => "Споделувањето ќе заврши на %s.\n\n",
 "Cheers!" => "Поздрав!",
 "Security Warning" => "Безбедносно предупредување",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 8b7ad7d32d8..12ea9e02336 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Toegang verboden",
 "Cloud not found" => "Cloud niet gevonden",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo daar,\n\neven een berichtje dat %s %s met u deelde.\nBekijk het: %s\n\n",
-"The share will expire on %s.\n\n" => "De Share vervalt op %s.\n\n\n\n",
 "Cheers!" => "Proficiat!",
 "Security Warning" => "Beveiligingswaarschuwing",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Je PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "Log in" => "Meld je aan",
 "Alternative Logins" => "Alternatieve inlogs",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo daar,<br><br>even een berichtje dat %s »%s« met u deelde.<br><a href=\"%s\">Bekijk hier!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Het delen stopt op %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren...",
 "This ownCloud instance is currently being updated, which may take a while." => "Deze ownCloud dienst wordt nu bijgewerkt, dat kan even duren.",
 "Please reload this page after a short time to continue using ownCloud." => "Laad deze pagina straks opnieuw om verder te gaan met ownCloud.",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index d9d1730cd4b..7cf5be575f4 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -61,6 +61,7 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Błąd przy zmianie uprawnień",
 "Shared with you and the group {group} by {owner}" => "Udostępnione tobie i grupie {group} przez {owner}",
 "Shared with you by {owner}" => "Udostępnione tobie przez {owner}",
+"Share link" => "Udostępnij link",
 "Password protect" => "Zabezpiecz hasłem",
 "Password" => "Hasło",
 "Allow Public Upload" => "Pozwól na  publiczne wczytywanie",
@@ -74,6 +75,7 @@ $TRANSLATIONS = array(
 "Resharing is not allowed" => "Współdzielenie nie jest możliwe",
 "Shared in {item} with {user}" => "Współdzielone w {item} z {user}",
 "Unshare" => "Zatrzymaj współdzielenie",
+"notify by email" => "powiadom przez emaila",
 "can edit" => "może edytować",
 "access control" => "kontrola dostępu",
 "create" => "utwórz",
@@ -119,7 +121,6 @@ $TRANSLATIONS = array(
 "Error untagging" => "Błąd odtagowania",
 "Access forbidden" => "Dostęp zabroniony",
 "Cloud not found" => "Nie odnaleziono chmury",
-"The share will expire on %s.\n\n" => "Udostępnienie wygaśnie w dniu %s.\n\n",
 "Cheers!" => "Pozdrawiam!",
 "Security Warning" => "Ostrzeżenie o zabezpieczeniach",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Twója wersja PHP jest narażona na NULL Byte attack (CVE-2006-7243)",
@@ -152,7 +153,7 @@ $TRANSLATIONS = array(
 "Log in" => "Zaloguj",
 "Alternative Logins" => "Alternatywne loginy",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Cześć,<br><br>Informuję cię że %s udostępnia ci »%s«.\n<br><a href=\"%s\">Zobacz!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Udostępnienie wygaśnie w dniu %s.<br><br>",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać."
+"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s. Może to trochę potrwać.",
+"Thank you for your patience." => "Dziękuję za cierpliwość."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index ed98ff09e51..4fd427217d1 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -132,7 +132,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Acesso proibido",
 "Cloud not found" => "Cloud não encontrado",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com vecê.\nVeja isto: %s\n\n",
-"The share will expire on %s.\n\n" => "O compartilhamento irá expirer em %s.\n\n",
+"The share will expire on %s." => "O compartilhamento irá expirar em %s.",
 "Cheers!" => "Saúde!",
 "Security Warning" => "Aviso de Segurança",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sua versão do PHP está vulnerável ao ataque NULL Byte (CVE-2006-7243)",
@@ -165,7 +165,6 @@ $TRANSLATIONS = array(
 "Log in" => "Fazer login",
 "Alternative Logins" => "Logins alternativos",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Olá,<br><br>só gostaria que você soubesse que %s compartilhou »%s« com você.<br><a href=\"%s\">Veja isto!</a><br><br",
-"The share will expire on %s.<br><br>" => "O compartilhamento irá expirar em %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Atualizando ownCloud para a versão %s, isto pode levar algum tempo.",
 "This ownCloud instance is currently being updated, which may take a while." => "Esta instância do ownCloud está sendo atualizada, o que pode demorar um pouco.",
 "Please reload this page after a short time to continue using ownCloud." => "Por favor, atualize esta página depois de um curto período de tempo para continuar usando ownCloud.",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 68cbad60d3f..27ae806fd52 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Доступ запрещён",
 "Cloud not found" => "Облако не найдено",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здравствуйте,\n\nпросто даём вам знать, что %s расшарил %s для вас.\nПосмотреть: %s\n\n",
-"The share will expire on %s.\n\n" => "Шара закончится %s\n\n",
 "Cheers!" => "Приветствуем!",
 "Security Warning" => "Предупреждение безопасности",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)",
@@ -165,11 +164,10 @@ $TRANSLATIONS = array(
 "Log in" => "Войти",
 "Alternative Logins" => "Альтернативные имена пользователя",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здравствуйте,<br><br>просто даём вам знать, что %s расшарил %s для вас.<br><a href=\"%s\">Посмотреть!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Шара закончится %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Идёт обновление ownCloud до версии %s. Это может занять некоторое время.",
 "This ownCloud instance is currently being updated, which may take a while." => "Производится обновление ownCloud, это может занять некоторое время.",
-"Please reload this page after a short time to continue using ownCloud." => "Перезагрузите эту страницу через короткое время чтобы продолжить использовать ownCloud.",
+"Please reload this page after a short time to continue using ownCloud." => "Перезагрузите эту страницу через некоторое время чтобы продолжить использовать ownCloud.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.",
-"Thank you for your patience." => "Спасибо за ваше терпение."
+"Thank you for your patience." => "Спасибо за терпение."
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 06e9392092b..81ce456e142 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -12,7 +12,9 @@ $TRANSLATIONS = array(
 "Share" => "Сделать общим",
 "Error" => "Ошибка",
 "Password" => "Пароль",
+"can edit" => "возможно редактирование",
 "Warning" => "Предупреждение",
+"Delete" => "Удалить",
 "Username" => "Имя пользователя",
 "Help" => "Помощь"
 );
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 1957a5d65bd..7e6a404db73 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -131,7 +131,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Prístup odmietnutý",
 "Cloud not found" => "Nenájdené",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ahoj,\n\nchcem ti dať navedomie, že %s zdieľa %s s tebou.\nZobrazenie tu: %s\n\n",
-"The share will expire on %s.\n\n" => "Zdieľanie vyexpiruje %s.\n\n",
 "Cheers!" => "Za zdravie!",
 "Security Warning" => "Bezpečnostné varovanie",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
@@ -164,7 +163,6 @@ $TRANSLATIONS = array(
 "Log in" => "Prihlásiť sa",
 "Alternative Logins" => "Alternatívne prihlásenie",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Ahoj,<br><br>chcem ti dať navedomie, že %s zdieľa »%s« s tebou.<br><a href=\"%s\">Zobrazenie tu!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Zdieľanie vyexpiruje %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, môže to chvíľu trvať.",
 "This ownCloud instance is currently being updated, which may take a while." => "Táto inštancia ownCloud sa práve aktualizuje, čo môže nejaký čas trvať.",
 "Please reload this page after a short time to continue using ownCloud." => "Prosím obnovte túto stránku a po krátkej dobe môžete pokračovať v používaní.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 0279fb4146f..ce1df56679f 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -1,9 +1,18 @@
 <?php
 $TRANSLATIONS = array(
-"%s shared »%s« with you" => "%s je delil »%s« z vami",
+"%s shared »%s« with you" => "%s je omogočil souporabo »%s«",
+"Couldn't send mail to following users: %s " => "Ni mogoče poslati sporočila za: %s",
+"Turned on maintenance mode" => "Vzdrževalni način je omogočen",
+"Turned off maintenance mode" => "Vzdrževalni način je onemogočen",
 "Updated database" => "Posodobljena podatkovna zbirka",
+"Updating filecache, this may take really long..." => "Poteka posodabljanje predpomnilnika datotek. Opravilo je lahko dolgotrajno ...",
+"Updated filecache" => "Predpomnilnik datotek je posodobljen",
+"... %d%% done ..." => "... %d%% končano ...",
+"No image or file provided" => "Ni podane datoteke ali slike",
 "Unknown filetype" => "Neznana vrsta datoteke",
 "Invalid image" => "Neveljavna slika",
+"No temporary profile picture available, try again" => "Na voljo ni nobene začasne slike za profil. Poskusite znova.",
+"No crop data provided" => "Ni podanih podatkov obreza",
 "Sunday" => "nedelja",
 "Monday" => "ponedeljek",
 "Tuesday" => "torek",
@@ -25,25 +34,31 @@ $TRANSLATIONS = array(
 "December" => "december",
 "Settings" => "Nastavitve",
 "seconds ago" => "pred nekaj sekundami",
-"_%n minute ago_::_%n minutes ago_" => array("","","","pred %n minutami"),
-"_%n hour ago_::_%n hours ago_" => array("","","","pred %n urami"),
+"_%n minute ago_::_%n minutes ago_" => array("pred %n minuto","pred %n minutama","pred %n minutami","pred %n minutami"),
+"_%n hour ago_::_%n hours ago_" => array("pred %n uro","pred %n urama","pred %n urami","pred %n urami"),
 "today" => "danes",
 "yesterday" => "včeraj",
-"_%n day ago_::_%n days ago_" => array("","","","pred %n dnevi"),
+"_%n day ago_::_%n days ago_" => array("pred %n dnevom","pred %n dnevoma","pred %n dnevi","pred %n dnevi"),
 "last month" => "zadnji mesec",
-"_%n month ago_::_%n months ago_" => array("","","","pred %n meseci"),
+"_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"),
 "months ago" => "mesecev nazaj",
 "last year" => "lansko leto",
 "years ago" => "let nazaj",
 "Choose" => "Izbor",
+"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
 "Yes" => "Da",
 "No" => "Ne",
 "Ok" => "V redu",
-"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
+"Error loading message template: {error}" => "Napaka nalaganja predloge sporočil: {error}",
+"_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"),
+"One file conflict" => "En spor datotek",
+"Which files do you want to keep?" => "Katare datoteke želite ohraniti?",
+"If you select both versions, the copied file will have a number added to its name." => "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.",
 "Cancel" => "Prekliči",
 "Continue" => "Nadaljuj",
 "(all selected)" => "(vse izbrano)",
 "({count} selected)" => "({count} izbranih)",
+"Error loading file exists template" => "Napaka nalaganja predloge obstoječih datotek",
 "Shared" => "V souporabi",
 "Share" => "Souporaba",
 "Error" => "Napaka",
@@ -52,19 +67,22 @@ $TRANSLATIONS = array(
 "Error while changing permissions" => "Napaka med spreminjanjem dovoljenj",
 "Shared with you and the group {group} by {owner}" => "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
 "Shared with you by {owner}" => "V souporabi z vami. Lastnik je {owner}.",
+"Share with user or group …" => "Souporaba z uporabnikom ali skupino ...",
+"Share link" => "Povezava za prejem",
 "Password protect" => "Zaščiti z geslom",
 "Password" => "Geslo",
-"Allow Public Upload" => "Dovoli javne prenose na strežnik",
+"Allow Public Upload" => "Dovoli javno pošiljanje na strežnik",
 "Email link to person" => "Posreduj povezavo po elektronski pošti",
 "Send" => "Pošlji",
 "Set expiration date" => "Nastavi datum preteka",
 "Expiration date" => "Datum preteka",
-"Share via email:" => "Souporaba preko elektronske pošte:",
+"Share via email:" => "Pošlji povezavo do dokumenta preko elektronske pošte:",
 "No people found" => "Ni najdenih uporabnikov",
 "group" => "skupina",
 "Resharing is not allowed" => "Nadaljnja souporaba ni dovoljena",
-"Shared in {item} with {user}" => "V souporabi v {item} z {user}",
+"Shared in {item} with {user}" => "V souporabi v {item} z uporabnikom {user}",
 "Unshare" => "Prekliči souporabo",
+"notify by email" => "obvesti po elektronski pošti",
 "can edit" => "lahko ureja",
 "access control" => "nadzor dostopa",
 "create" => "ustvari",
@@ -78,17 +96,21 @@ $TRANSLATIONS = array(
 "Email sent" => "Elektronska pošta je poslana",
 "Warning" => "Opozorilo",
 "The object type is not specified." => "Vrsta predmeta ni podana.",
+"Enter new" => "Vnesite novo",
 "Delete" => "Izbriši",
 "Add" => "Dodaj",
 "Edit tags" => "Uredi oznake",
+"Error loading dialog template: {error}" => "Napaka nalaganja predloge pogovornega okna: {error}",
+"No tags selected for deletion." => "Ni izbranih oznak za izbris.",
 "The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Posodobitev ni uspela. Pošljite poročilo o napaki na sistemu <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud</a>.",
 "The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
+"%s password reset" => "Ponastavitev gesla %s",
 "Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}",
 "The link to reset your password has been sent to your email.<br>If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator ." => "Povezava za ponastavitev gesla je bila poslana na elektronski naslov.<br>V kolikor sporočila ne prejmete v doglednem času, preverite tudi mape vsiljene pošte.<br>Če ne bo niti tam, stopite v stik s skrbnikom.",
 "Request failed!<br>Did you make sure your email/username was right?" => "Zahteva je spodletela!<br>Ali sta elektronski naslov oziroma uporabniško ime navedena pravilno?",
 "You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
 "Username" => "Uporabniško ime",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ste prepričani, da želite nadaljevati?",
+"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
 "Yes, I really want to reset my password now" => "Da, potrjujem ponastavitev gesla",
 "Reset" => "Ponastavi",
 "Your password was reset" => "Geslo je ponovno nastavljeno",
@@ -101,15 +123,24 @@ $TRANSLATIONS = array(
 "Admin" => "Skrbništvo",
 "Help" => "Pomoč",
 "Error loading tags" => "Napaka nalaganja oznak",
+"Tag already exists" => "Oznaka že obstaja",
+"Error deleting tag(s)" => "Napaka brisanja oznak",
+"Error tagging" => "Napaka označevanja",
+"Error untagging" => "Napaka odstranjevanja oznak",
+"Error favoriting" => "Napaka označevanja priljubljenosti",
+"Error unfavoriting" => "Napaka odstranjevanja oznake priljubljenosti",
 "Access forbidden" => "Dostop je prepovedan",
 "Cloud not found" => "Oblaka ni mogoče najti",
+"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n",
+"The share will expire on %s." => "Povezava souporabe bo potekla %s.",
+"Cheers!" => "Na zdravje!",
 "Security Warning" => "Varnostno opozorilo",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Za varno uporabo storitve %s posodobite PHP",
+"Please update your PHP installation to use %s securely." => "Za varno uporabo storitve %s, je treba posodobiti namestitev PHP",
 "No secure random number generator is available, please enable the PHP OpenSSL extension." => "Na voljo ni nobenega varnega ustvarjalnika naključnih števil. Omogočiti je treba razširitev PHP OpenSSL.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Brez varnega ustvarjalnika naključnih števil je mogoče napovedati žetone za ponastavitev gesla, s čimer je mogoče prevzeti nadzor nad računom.",
 "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za navodila, kako pravilno nastaviti vaš strežnik, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
+"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
 "Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
 "Advanced" => "Napredne možnosti",
 "Data folder" => "Podatkovna mapa",
@@ -120,17 +151,24 @@ $TRANSLATIONS = array(
 "Database name" => "Ime podatkovne zbirke",
 "Database tablespace" => "Razpredelnica podatkovne zbirke",
 "Database host" => "Gostitelj podatkovne zbirke",
-"Finish setup" => "Končaj namestitev",
+"Finish setup" => "Končaj nastavitev",
 "Finishing …" => "Poteka zaključevanje opravila ...",
 "%s is available. Get more information on how to update." => "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
 "Log out" => "Odjava",
 "Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!",
 "If you did not change your password recently, your account may be compromised!" => "V primeru, da gesla za dostop že nekaj časa niste spremenili, je račun lahko ogrožen!",
 "Please change your password to secure your account again." => "Spremenite geslo za izboljšanje zaščite računa.",
+"Server side authentication failed!" => "Overitev s strežnika je spodletela!",
+"Please contact your administrator." => "Stopite v stik s skrbnikom sistema.",
 "Lost your password?" => "Ali ste pozabili geslo?",
 "remember" => "zapomni si",
 "Log in" => "Prijava",
 "Alternative Logins" => "Druge prijavne možnosti",
-"Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno."
+"Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Pozdravljeni,<br><br>oseba %s vam je omogočila souporabo %s.<br>Vir si lahko ogledate na <a href=\"%s\">tem naslovu</a>.<br><br>",
+"Updating ownCloud to version %s, this may take a while." => "Posodabljanje sistema ownCloud na različico %s je lahko dolgotrajno.",
+"This ownCloud instance is currently being updated, which may take a while." => "Nastavitev oblaka ownCloud se trenutno posodablja. Opravilo je lahko dolgotrajno ...",
+"Please reload this page after a short time to continue using ownCloud." => "Ponovno naložite to stran po krajšem preteku časa in nadaljujte z uporabo oblaka ownCloud.",
+"Contact your system administrator if this message persists or appeared unexpectedly." => "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
+"Thank you for your patience." => "Hvala za potrpežljivost!"
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index b668bc108d9..e40aafe2026 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -132,7 +132,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Åtkomst förbjuden",
 "Cloud not found" => "Hittade inget moln",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej där,⏎\n⏎\nville bara meddela dig att %s delade %s med dig.⏎\nTitta på den: %s⏎\n⏎\n",
-"The share will expire on %s.\n\n" => "Utdelningen kommer att upphöra %s.⏎\n⏎\n",
 "Cheers!" => "Vi höres!",
 "Security Warning" => "Säkerhetsvarning",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
@@ -165,7 +164,6 @@ $TRANSLATIONS = array(
 "Log in" => "Logga in",
 "Alternative Logins" => "Alternativa inloggningar",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hej där,<br><br>ville bara informera dig om att %s delade »%s« med dig.<br><a href=\"%s\">Titta på den!</a><br><br>",
-"The share will expire on %s.<br><br>" => "Utdelningen kommer att upphöra %s.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund.",
 "This ownCloud instance is currently being updated, which may take a while." => "Denna ownCloud instans håller på att uppdatera, vilket kan ta ett tag.",
 "Please reload this page after a short time to continue using ownCloud." => "Var god och ladda om denna sida efter en kort stund för att fortsätta använda ownCloud.",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 46cbaf8b142..74eff9317c2 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -132,7 +132,7 @@ $TRANSLATIONS = array(
 "Access forbidden" => "Erişim yasaklı",
 "Cloud not found" => "Bulut bulunamadı",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Merhaba,\n\nSadece %s sizinle %s paylaşımını yaptığını bildiriyoruz.\nBuradan bakabilirsiniz: %s\n\n",
-"The share will expire on %s.\n\n" => "Paylaşım %s tarihinde bitecektir.\n\n",
+"The share will expire on %s." => "Bu paylaşım %s tarihinde sona erecek.",
 "Cheers!" => "Şerefe!",
 "Security Warning" => "Güvenlik Uyarisi",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
@@ -165,7 +165,6 @@ $TRANSLATIONS = array(
 "Log in" => "Giriş yap",
 "Alternative Logins" => "Alternatif Girişler",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "Merhaba, <br><br> %s sizinle »%s« paylaşımında bulundu.<br><a href=\"%s\">Paylaşımı gör!</a><br><br>İyi günler!",
-"The share will expire on %s.<br><br>" => "Bu paylaşım %s tarihinde dolacaktır.<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "Owncloud %s versiyonuna güncelleniyor. Biraz zaman alabilir.",
 "This ownCloud instance is currently being updated, which may take a while." => "Bu ownCloud örneği şu anda güncelleniyor, bu biraz zaman alabilir.",
 "Please reload this page after a short time to continue using ownCloud." => "ownCloud kullanmaya devam etmek için kısa bir süre sonra lütfen sayfayı yenileyin.",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 3fe65720adf..cfe4e69c129 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -131,7 +131,6 @@ $TRANSLATIONS = array(
 "Access forbidden" => "存取被拒",
 "Cloud not found" => "找不到網頁",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "嗨，\n\n%s 和你分享了 %s ，到這裡看它：%s\n",
-"The share will expire on %s.\n\n" => "分享將於 %s 過期\n",
 "Cheers!" => "太棒了！",
 "Security Warning" => "安全性警告",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
@@ -164,7 +163,6 @@ $TRANSLATIONS = array(
 "Log in" => "登入",
 "Alternative Logins" => "其他登入方法",
 "Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href=\"%s\">View it!</a><br><br>" => "嗨，<br><br>%s 和你分享了 %s ，到<a href=\"%s\">這裡</a>看它<br><br>",
-"The share will expire on %s.<br><br>" => "分享將於 %s 過期<br><br>",
 "Updating ownCloud to version %s, this may take a while." => "正在將 ownCloud 升級至版本 %s ，這可能需要一點時間。",
 "This ownCloud instance is currently being updated, which may take a while." => "ownCloud 正在升級，請稍待一會。",
 "Please reload this page after a short time to continue using ownCloud." => "請稍後重新載入這個頁面就可以繼續使用 ownCloud",
diff --git a/core/templates/altmail.php b/core/templates/altmail.php
index 00b67bee456..7776919ea34 100644
--- a/core/templates/altmail.php
+++ b/core/templates/altmail.php
@@ -1,7 +1,8 @@
 <?php
 print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
 if ( isset($_['expiration']) ) {
-	print_unescaped($l->t("The share will expire on %s.\n\n", array($_['expiration'])));
+	print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
+	print_unescaped('\n\n');
 }
 p($l->t("Cheers!"));
 ?>
diff --git a/core/templates/mail.php b/core/templates/mail.php
index 40092f5491f..4fa54aa5283 100644
--- a/core/templates/mail.php
+++ b/core/templates/mail.php
@@ -14,7 +14,8 @@
 <?php
 print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »%s« with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link'])));
 if ( isset($_['expiration']) ) {
-	print_unescaped($l->t("The share will expire on %s.<br><br>", array($_['expiration'])));
+	p($l->t("The share will expire on %s.", array($_['expiration'])));
+	print_unescaped('<br><br>');
 }
 p($l->t('Cheers!'));
 ?>