Merge branch 'master' of github.com:owncloud/core into vcategories_db

15 files changed, 169 insertions, 35 deletions

diff --git a/core/css/styles.css b/core/css/styles.css
index 35ef8c36ddf..a6c10504070 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -34,12 +34,13 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', end
 
 /* INPUTS */
 input[type="text"], input[type="password"] { cursor:text; }
-input, textarea, select, button, .button, #quota, div.jp-progress, .pager li a { font-size:1em; width:10em; margin:.3em; padding:.6em .5em .4em; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; }
-input[type="text"], input[type="password"], input[type="search"] { background:#f8f8f8; color:#555; cursor:text; }
+input, textarea, select, button, .button, #quota, div.jp-progress, .pager li a { font-size:1em; font-family:Arial, Verdana, sans-serif; width:10em; margin:.3em; padding:.6em .5em .4em; background:#fff; color:#333; border:1px solid #ddd; -moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; outline:none; }
+input[type="text"], input[type="password"], input[type="search"], textarea { background:#f8f8f8; color:#555; cursor:text; }
 input[type="text"], input[type="password"], input[type="search"] { -webkit-appearance:textfield; -moz-appearance:textfield; -webkit-box-sizing:content-box; -moz-box-sizing:content-box; box-sizing:content-box; }
 input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
 input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active,
-.searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+.searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active,
+textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
 
 input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
 input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover { background:#fff; color:#333; }
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 6d925e5b616..0801dd4b663 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -25,6 +25,8 @@
 "Error while sharing" => "Fejl under deling",
 "Error while unsharing" => "Fejl under annullering af deling",
 "Error while changing permissions" => "Fejl under justering af rettigheder",
+"Shared with you and the group {group} by {owner}" => "Delt med dig og gruppen {group} af {owner}",
+"Shared with you by {owner}" => "Delt med dig af {owner}",
 "Share with" => "Del med",
 "Share with link" => "Del med link",
 "Password protect" => "Beskyt med adgangskode",
@@ -34,6 +36,7 @@
 "Share via email:" => "Del via email:",
 "No people found" => "Ingen personer fundet",
 "Resharing is not allowed" => "Videredeling ikke tilladt",
+"Shared in {item} with {user}" => "Delt i {item} med {user}",
 "Unshare" => "Fjern deling",
 "can edit" => "kan redigere",
 "access control" => "Adgangskontrol",
@@ -65,6 +68,9 @@
 "Edit categories" => "Rediger kategorier",
 "Add" => "Tilføj",
 "Security Warning" => "Sikkerhedsadvarsel",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen sikker tilfældighedsgenerator til tal er tilgængelig. Aktiver venligst OpenSSL udvidelsen.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Uden en sikker tilfældighedsgenerator til tal kan en angriber måske gætte dit gendan kodeord og overtage din konto",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen som ownCloud leverer virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver på en måske så data mappen ikke  længere er tilgængelig eller at du flytter data mappen uden for webserverens dokument rod.  ",
 "Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
 "Advanced" => "Avanceret",
 "Data folder" => "Datamappe",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 230d4fc8402..0fc878938ba 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -25,6 +25,8 @@
 "Error while sharing" => "Fehler beim Freigeben",
 "Error while unsharing" => "Fehler beim Aufheben der Freigabe",
 "Error while changing permissions" => "Fehler beim Ändern  der Rechte",
+"Shared with you and the group {group} by {owner}" => "{owner} hat dies für Dich und die Gruppe {group} freigegeben",
+"Shared with you by {owner}" => "{owner} hat dies für Dich freigegeben",
 "Share with" => "Freigeben für",
 "Share with link" => "Über einen Link freigeben",
 "Password protect" => "Passwortschutz",
@@ -34,24 +36,25 @@
 "Share via email:" => "Über eine E-Mail freigeben:",
 "No people found" => "Niemand gefunden",
 "Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
+"Shared in {item} with {user}" => "Für {user} in {item} freigegeben",
 "Unshare" => "Freigabe aufheben",
 "can edit" => "kann bearbeiten",
 "access control" => "Zugriffskontrolle",
 "create" => "erstellen",
 "update" => "aktualisieren",
 "delete" => "löschen",
-"share" => "teilen",
+"share" => "freigeben",
 "Password protected" => "Durch ein Passwort geschützt",
 "Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
-"Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
+"Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
 "Requested" => "Angefragt",
 "Login failed!" => "Login fehlgeschlagen!",
 "Username" => "Benutzername",
 "Request reset" => "Beantrage Zurücksetzung",
-"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
+"Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
 "To login page" => "Zur Login-Seite",
 "New password" => "Neues Passwort",
 "Reset password" => "Passwort zurücksetzen",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index bde848621d2..8b81e0ef185 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -43,13 +43,13 @@
 "create" => "erstellen",
 "update" => "aktualisieren",
 "delete" => "löschen",
-"share" => "teilen",
+"share" => "freigeben",
 "Password protected" => "Durch ein Passwort geschützt",
 "Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Du erhälst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
+"You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
 "Requested" => "Angefragt",
 "Login failed!" => "Login fehlgeschlagen!",
 "Username" => "Benutzername",
@@ -90,7 +90,7 @@
 "Lost your password?" => "Passwort vergessen?",
 "remember" => "merken",
 "Log in" => "Einloggen",
-"You are logged out." => "Du wurdest abgemeldet.",
+"You are logged out." => "Sie wurden abgemeldet.",
 "prev" => "Zurück",
 "next" => "Weiter",
 "Security Warning!" => "Sicherheitshinweis!",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 2914eb774ab..456f436ba8c 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -25,6 +25,8 @@
 "Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό",
 "Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
 "Error while changing permissions" => "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
+"Shared with you and the group {group} by {owner}" => "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
+"Shared with you by {owner}" => "Διαμοιράστηκε με σας από τον {owner}",
 "Share with" => "Διαμοιρασμός με",
 "Share with link" => "Διαμοιρασμός με σύνδεσμο",
 "Password protect" => "Προστασία κωδικού",
@@ -34,6 +36,7 @@
 "Share via email:" => "Διαμοιρασμός μέσω email:",
 "No people found" => "Δεν βρέθηκε άνθρωπος",
 "Resharing is not allowed" => "Ξαναμοιρασμός δεν επιτρέπεται",
+"Shared in {item} with {user}" => "Διαμοιρασμός του {item} με τον {user}",
 "Unshare" => "Σταμάτημα μοιράσματος",
 "can edit" => "δυνατότητα αλλαγής",
 "access control" => "έλεγχος πρόσβασης",
@@ -65,6 +68,7 @@
 "Edit categories" => "Επεξεργασία κατηγορίας",
 "Add" => "Προσθήκη",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ο κατάλογος data και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο  .htaccess που παρέχει το ownCloud δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος data να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο data έξω από τον κατάλογο του διακομιστή.",
 "Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
 "Advanced" => "Για προχωρημένους",
 "Data folder" => "Φάκελος δεδομένων",
@@ -78,10 +82,14 @@
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
 "web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
 "Log out" => "Αποσύνδεση",
+"Automatic logon rejected!" => "Απορρίφθηκε η αυτόματη σύνδεση!",
+"Please change your password to secure your account again." => "Παρακαλώ αλλάξτε τον κωδικό σας για να ασφαλίσετε πάλι τον λογαριασμό σας.",
 "Lost your password?" => "Ξεχάσατε τον κωδικό σας;",
 "remember" => "να με θυμάσαι",
 "Log in" => "Είσοδος",
 "You are logged out." => "Έχετε αποσυνδεθεί.",
 "prev" => "προηγούμενο",
-"next" => "επόμενο"
+"next" => "επόμενο",
+"Security Warning!" => "Προειδοποίηση Ασφαλείας!",
+"Verify" => "Επαλήθευση"
 );
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index bc97cd04036..68c4a43470c 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -15,13 +15,32 @@
 "October" => "Oktoober",
 "November" => "November",
 "December" => "Detsember",
+"Choose" => "Vali",
 "Cancel" => "Loobu",
 "No" => "Ei",
 "Yes" => "Jah",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
 "Error" => "Viga",
+"Error while sharing" => "Viga jagamisel",
+"Error while unsharing" => "Viga jagamise lõpetamisel",
+"Error while changing permissions" => "Viga õiguste muutmisel",
+"Share with" => "Jaga",
+"Share with link" => "Jaga lingiga",
+"Password protect" => "Parooliga kaitstud",
 "Password" => "Parool",
+"Set expiration date" => "Määra aegumise kuupäev",
+"Expiration date" => "Aegumise kuupäev",
+"Share via email:" => "Jaga e-postiga:",
+"No people found" => "Ühtegi inimest ei leitud",
+"Unshare" => "Lõpeta jagamine",
+"can edit" => "saab muuta",
+"access control" => "ligipääsukontroll",
+"create" => "loo",
+"update" => "uuenda",
+"delete" => "kustuta",
+"share" => "jaga",
+"Password protected" => "Parooliga kaitstud",
 "ownCloud password reset" => "ownCloud parooli taastamine",
 "Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
 "You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
@@ -42,6 +61,7 @@
 "Cloud not found" => "Pilve ei leitud",
 "Edit categories" => "Muuda kategooriaid",
 "Add" => "Lisa",
+"Security Warning" => "Turvahoiatus",
 "Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
 "Advanced" => "Lisavalikud",
 "Data folder" => "Andmete kaust",
@@ -59,5 +79,7 @@
 "Log in" => "Logi sisse",
 "You are logged out." => "Sa oled välja loginud",
 "prev" => "eelm",
-"next" => "järgm"
+"next" => "järgm",
+"Security Warning!" => "turvahoiatus!",
+"Verify" => "Kinnita"
 );
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index a8da4f37b4e..536f3d8ba82 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -63,6 +63,7 @@
 "Cloud not found" => "Pilveä ei löydy",
 "Edit categories" => "Muokkaa luokkia",
 "Add" => "Lisää",
+"Security Warning" => "Turvallisuusvaroitus",
 "Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
 "Advanced" => "Lisäasetukset",
 "Data folder" => "Datakansio",
@@ -81,5 +82,6 @@
 "Log in" => "Kirjaudu sisään",
 "You are logged out." => "Olet kirjautunut ulos.",
 "prev" => "edellinen",
-"next" => "seuraava"
+"next" => "seuraava",
+"Security Warning!" => "Turvallisuusvaroitus!"
 );
diff --git a/core/l10n/id.php b/core/l10n/id.php
index c71d767dbf5..8e0bb5929ef 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -15,12 +15,38 @@
 "October" => "Oktober",
 "November" => "Nopember",
 "December" => "Desember",
+"Choose" => "pilih",
 "Cancel" => "Batalkan",
 "No" => "Tidak",
 "Yes" => "Ya",
 "Ok" => "Oke",
 "No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.",
+"Error" => "gagal",
+"Error while sharing" => "gagal ketika membagikan",
+"Error while unsharing" => "gagal ketika membatalkan pembagian",
+"Error while changing permissions" => "gagal ketika merubah perijinan",
+"Shared with you and the group {group} by {owner}" => "dibagikan dengan anda dan grup {group} oleh {owner}",
+"Shared with you by {owner}" => "dibagikan dengan anda oleh {owner}",
+"Share with" => "bagikan dengan",
+"Share with link" => "bagikan dengan tautan",
+"Password protect" => "lindungi dengan kata kunci",
 "Password" => "Password",
+"Set expiration date" => "set tanggal kadaluarsa",
+"Expiration date" => "tanggal kadaluarsa",
+"Share via email:" => "berbagi memlalui surel:",
+"No people found" => "tidak ada orang ditemukan",
+"Resharing is not allowed" => "berbagi ulang tidak diperbolehkan",
+"Shared in {item} with {user}" => "dibagikan dalam {item} dengan {user}",
+"Unshare" => "batalkan berbagi",
+"can edit" => "dapat merubah",
+"access control" => "kontrol akses",
+"create" => "buat baru",
+"update" => "baharui",
+"delete" => "hapus",
+"share" => "bagikan",
+"Password protected" => "dilindungi kata kunci",
+"Error unsetting expiration date" => "gagal melepas tanggal kadaluarsa",
+"Error setting expiration date" => "gagal memasang tanggal kadaluarsa",
 "ownCloud password reset" => "reset password ownCloud",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
@@ -41,6 +67,8 @@
 "Cloud not found" => "Cloud tidak ditemukan",
 "Edit categories" => "Edit kategori",
 "Add" => "Tambahkan",
+"Security Warning" => "peringatan keamanan",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "tanpa generator angka acak, penyerang mungkin dapat menebak token reset kata kunci dan mengambil alih akun anda.",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
 "Advanced" => "Tingkat Lanjut",
 "Data folder" => "Folder data",
@@ -49,14 +77,21 @@
 "Database user" => "Pengguna database",
 "Database password" => "Password database",
 "Database name" => "Nama database",
+"Database tablespace" => "tablespace basis data",
 "Database host" => "Host database",
 "Finish setup" => "Selesaikan instalasi",
 "web services under your control" => "web service dibawah kontrol anda",
 "Log out" => "Keluar",
+"Automatic logon rejected!" => "login otomatis ditolak!",
+"If you did not change your password recently, your account may be compromised!" => "apabila anda tidak merubah kata kunci belakangan ini, akun anda dapat di gunakan orang lain!",
+"Please change your password to secure your account again." => "mohon ubah kata kunci untuk mengamankan akun anda",
 "Lost your password?" => "Lupa password anda?",
 "remember" => "selalu login",
 "Log in" => "Masuk",
 "You are logged out." => "Anda telah keluar.",
 "prev" => "sebelum",
-"next" => "selanjutnya"
+"next" => "selanjutnya",
+"Security Warning!" => "peringatan keamanan!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "mohon periksa kembali kata kunci anda. <br/>untuk alasan keamanan,anda akan sesekali diminta untuk memasukan kata kunci lagi.",
+"Verify" => "periksa kembali"
 );
diff --git a/core/l10n/it.php b/core/l10n/it.php
index de76771daca..234b48b16e0 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -36,6 +36,7 @@
 "Share via email:" => "Condividi tramite email:",
 "No people found" => "Non sono state trovate altre persone",
 "Resharing is not allowed" => "La ri-condivisione non è consentita",
+"Shared in {item} with {user}" => "Condiviso in {item} con {user}",
 "Unshare" => "Rimuovi condivisione",
 "can edit" => "può modificare",
 "access control" => "controllo d'accesso",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index d15fc1179bc..ec96fec745a 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -1,20 +1,20 @@
 <?php $TRANSLATIONS = array(
-"Application name not provided." => "Applicatie naam niet gegeven.",
+"Application name not provided." => "Applicatienaam niet gegeven.",
 "No category to add?" => "Geen categorie toevoegen?",
-"This category already exists: " => "De categorie bestaat al.",
+"This category already exists: " => "Deze categorie bestaat al.",
 "Settings" => "Instellingen",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Maart",
-"April" => "April",
-"May" => "Mei",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Augustus",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
+"January" => "januari",
+"February" => "februari",
+"March" => "maart",
+"April" => "april",
+"May" => "mei",
+"June" => "juni",
+"July" => "juli",
+"August" => "augustus",
+"September" => "september",
+"October" => "oktober",
+"November" => "november",
+"December" => "december",
 "Choose" => "Kies",
 "Cancel" => "Annuleren",
 "No" => "Nee",
@@ -44,12 +44,12 @@
 "update" => "bijwerken",
 "delete" => "verwijderen",
 "share" => "deel",
-"Password protected" => "Passeerwoord beveiligd",
+"Password protected" => "Wachtwoord beveiligd",
 "Error unsetting expiration date" => "Fout tijdens het verwijderen van de verval datum",
-"Error setting expiration date" => "Fout tijdens het configureren van de vervaldatum",
+"Error setting expiration date" => "Fout tijdens het instellen van de vervaldatum",
 "ownCloud password reset" => "ownCloud wachtwoord herstellen",
 "Use the following link to reset your password: {link}" => "Gebruik de volgende link om je wachtwoord te resetten: {link}",
-"You will receive a link to reset your password via Email." => "U ontvangt een link om je wachtwoord opnieuw in te stellen via e-mail.",
+"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
 "Requested" => "Gevraagd",
 "Login failed!" => "Login mislukt!",
 "Username" => "Gebruikersnaam",
@@ -68,7 +68,7 @@
 "Edit categories" => "Wijzigen categorieën",
 "Add" => "Toevoegen",
 "Security Warning" => "Beveiligings waarschuwing",
-"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen random nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan.",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Er kon geen willekeurig nummer worden gegenereerd. Zet de PHP OpenSSL extentie aan.",
 "Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Zonder random nummer generator is het mogelijk voor een aanvaller om de reset tokens van wachtwoorden te voorspellen. Dit kan leiden tot het inbreken op uw account.",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Uw data is waarschijnlijk toegankelijk vanaf net internet. Het  .htaccess bestand dat ownCloud levert werkt niet goed. U wordt aangeraden om de configuratie van uw webserver zodanig aan te passen dat de data folders niet meer publiekelijk toegankelijk zijn. U kunt ook de data folder verplaatsen naar een folder buiten de webserver document folder.",
 "Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
@@ -82,7 +82,7 @@
 "Database tablespace" => "Database tablespace",
 "Database host" => "Database server",
 "Finish setup" => "Installatie afronden",
-"web services under your control" => "webdiensten die je beheerst",
+"web services under your control" => "Webdiensten in eigen beheer",
 "Log out" => "Afmelden",
 "Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
 "If you did not change your password recently, your account may be compromised!" => "Als u uw wachtwoord niet onlangs heeft aangepast, kan uw account overgenomen zijn!",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index a0fa51da76d..ddae12b2e72 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -25,6 +25,8 @@
 "Error while sharing" => "Błąd podczas współdzielenia",
 "Error while unsharing" => "Błąd podczas zatrzymywania współdzielenia",
 "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 Ci przez {owner}",
 "Share with" => "Współdziel z",
 "Share with link" => "Współdziel z link",
 "Password protect" => "Zabezpieczone hasłem",
@@ -34,6 +36,7 @@
 "Share via email:" => "Współdziel poprzez maila",
 "No people found" => "Nie znaleziono ludzi",
 "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",
 "can edit" => "można edytować",
 "access control" => "kontrola dostępu",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 4aec059d407..26a94b24f32 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -15,13 +15,37 @@
 "October" => "Октябрь",
 "November" => "Ноябрь",
 "December" => "Декабрь",
+"Choose" => "Выбрать",
 "Cancel" => "Отмена",
 "No" => "Нет",
 "Yes" => "Да",
 "Ok" => "Ок",
 "No categories selected for deletion." => "Нет категорий для удаления.",
 "Error" => "Ошибка",
+"Error while sharing" => "Ошибка при открытии доступа",
+"Error while unsharing" => "Ошибка при закрытии доступа",
+"Error while changing permissions" => "Ошибка при смене разрешений",
+"Shared with you and the group {group} by {owner}" => "{owner} открыл доступ для Вас и группы {group} ",
+"Shared with you by {owner}" => "{owner} открыл доступ для Вас",
+"Share with" => "Поделиться с",
+"Share with link" => "Поделиться с ссылкой",
+"Password protect" => "Защитить паролем",
 "Password" => "Пароль",
+"Set expiration date" => "Установить срок доступа",
+"Expiration date" => "Дата окончания",
+"Share via email:" => "Поделится через электронную почту:",
+"No people found" => "Ни один человек не найден",
+"Resharing is not allowed" => "Общий доступ не разрешен",
+"Unshare" => "Закрыть общий доступ",
+"can edit" => "может редактировать",
+"access control" => "контроль доступа",
+"create" => "создать",
+"update" => "обновить",
+"delete" => "удалить",
+"share" => "открыть доступ",
+"Password protected" => "Защищено паролем",
+"Error unsetting expiration date" => "Ошибка при отмене срока доступа",
+"Error setting expiration date" => "Ошибка при установке срока доступа",
 "ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
@@ -42,6 +66,7 @@
 "Cloud not found" => "Облако не найдено",
 "Edit categories" => "Редактировать категории",
 "Add" => "Добавить",
+"Security Warning" => "Предупреждение безопасности",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
 "Advanced" => "Дополнительно",
 "Data folder" => "Директория с данными",
@@ -60,5 +85,7 @@
 "Log in" => "Войти",
 "You are logged out." => "Вы вышли.",
 "prev" => "пред",
-"next" => "след"
+"next" => "след",
+"Security Warning!" => "Предупреждение безопасности!",
+"Verify" => "Подтвердить"
 );
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 2743262a774..314624959bd 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -25,6 +25,8 @@
 "Error while sharing" => "Chyba počas zdieľania",
 "Error while unsharing" => "Chyba počas ukončenia zdieľania",
 "Error while changing permissions" => "Chyba počas zmeny oprávnení",
+"Shared with you and the group {group} by {owner}" => "Zdieľané s vami a so skupinou {group} užívateľom {owner}",
+"Shared with you by {owner}" => "Zdieľané s vami užívateľom {owner}",
 "Share with" => "Zdieľať s",
 "Share with link" => "Zdieľať cez odkaz",
 "Password protect" => "Chrániť heslom",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 44baddb9c85..dde5cb5220c 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -25,13 +25,28 @@
 "Error while sharing" => "பகிரும் போதான வழு",
 "Error while unsharing" => "பகிராமல் உள்ளப்போதான வழு",
 "Error while changing permissions" => "அனுமதிகள் மாறும்போதான வழு",
+"Shared with you and the group {group} by {owner}" => "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+"Shared with you by {owner}" => "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
 "Share with" => "பகிர்தல்",
 "Share with link" => "இணைப்புடன் பகிர்தல்",
 "Password protect" => "கடவுச்சொல்லை பாதுகாத்தல்",
 "Password" => "கடவுச்சொல்",
+"Set expiration date" => "காலாவதி தேதியை குறிப்பிடுக",
+"Expiration date" => "காலவதியாகும் திகதி",
+"Share via email:" => "மின்னஞ்சலினூடான பகிர்வு: ",
+"No people found" => "நபர்கள் யாரும் இல்லை",
+"Resharing is not allowed" => "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
+"Shared in {item} with {user}" => "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
+"Unshare" => "பகிரமுடியாது",
+"can edit" => "தொகுக்க முடியும்",
+"access control" => "கட்டுப்பாடான அணுகல்",
 "create" => "படைத்தல்",
 "update" => "இற்றைப்படுத்தல்",
 "delete" => "நீக்குக",
+"share" => "பகிர்தல்",
+"Password protected" => "கடவுச்சொல் பாதுகாக்கப்பட்டது",
+"Error unsetting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
+"Error setting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
 "ownCloud password reset" => "ownCloud இன் கடவுச்சொல் மீளமைப்பு",
 "Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
 "You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
@@ -52,6 +67,7 @@
 "Cloud not found" => "Cloud கண்டுப்பிடிப்படவில்லை",
 "Edit categories" => "வகைகளை தொகுக்க",
 "Add" => "சேர்க்க",
+"Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
 "Create an <strong>admin account</strong>" => "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
 "Advanced" => "மேம்பட்ட",
 "Data folder" => "தரவு கோப்புறை",
@@ -65,10 +81,16 @@
 "Finish setup" => "அமைப்பை முடிக்க",
 "web services under your control" => "உங்கள் கட்டுப்பாட்டின் கீழ் இணைய சேவைகள்",
 "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." => "உங்களுடைய கணக்கை மீண்டும் பாதுகாக்க தயவுசெய்து உங்களுடைய கடவுச்சொல்லை மாற்றவும்.",
 "Lost your password?" => "உங்கள் கடவுச்சொல்லை தொலைத்துவிட்டீர்களா?",
 "remember" => "ஞாபகப்படுத்துக",
 "Log in" => "புகுபதிகை",
 "You are logged out." => "நீங்கள் விடுபதிகை செய்துவிட்டீர்கள்.",
 "prev" => "முந்தைய",
-"next" => "அடுத்து"
+"next" => "அடுத்து",
+"Security Warning!" => "பாதுகாப்பு எச்சரிக்கை",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "உங்களுடைய கடவுச்சொல்லை உறுதிப்படுத்துக. <br/> பாதுகாப்பு காரணங்களுக்காக நீங்கள் எப்போதாவது உங்களுடைய கடவுச்சொல்லை மீண்டும் நுழைக்க கேட்கப்படுவீர்கள்.",
+"Verify" => "உறுதிப்படுத்தல்"
 );
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 5e9d05d204a..dc5da776fac 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -65,6 +65,7 @@
 "Edit categories" => "编辑分类",
 "Add" => "添加",
 "Security Warning" => "安全警告",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "随机数生成器无效，请启用PHP的OpenSSL扩展",
 "Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
 "Advanced" => "高级",
 "Data folder" => "数据目录",
@@ -83,5 +84,6 @@
 "Log in" => "登录",
 "You are logged out." => "您已注销。",
 "prev" => "上一页",
-"next" => "下一页"
+"next" => "下一页",
+"Security Warning!" => "安全警告！"
 );