diff --git a/3rdparty/Archive/Tar.php b/3rdparty/Archive/Tar.php
index 33c7d395d0..fd2d5d7d9b 100644
--- a/3rdparty/Archive/Tar.php
+++ b/3rdparty/Archive/Tar.php
@@ -981,7 +981,7 @@ class Archive_Tar extends PEAR
// }}}
// {{{ _addFile()
- function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir)
+ function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $v_stored_filename=null)
{
if (!$this->_file) {
$this->_error('Invalid file descriptor');
@@ -993,28 +993,31 @@ class Archive_Tar extends PEAR
return false;
}
- // ----- Calculate the stored filename
- $p_filename = $this->_translateWinPath($p_filename, false);;
- $v_stored_filename = $p_filename;
- if (strcmp($p_filename, $p_remove_dir) == 0) {
- return true;
- }
- if ($p_remove_dir != '') {
- if (substr($p_remove_dir, -1) != '/')
- $p_remove_dir .= '/';
+ // ownCloud change to make it possible to specify the filename to use
+ if(is_null($v_stored_filename)) {
+ // ----- Calculate the stored filename
+ $p_filename = $this->_translateWinPath($p_filename, false);
+ $v_stored_filename = $p_filename;
+ if (strcmp($p_filename, $p_remove_dir) == 0) {
+ return true;
+ }
+ if ($p_remove_dir != '') {
+ if (substr($p_remove_dir, -1) != '/')
+ $p_remove_dir .= '/';
- if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir)
- $v_stored_filename = substr($p_filename, strlen($p_remove_dir));
- }
- $v_stored_filename = $this->_translateWinPath($v_stored_filename);
- if ($p_add_dir != '') {
- if (substr($p_add_dir, -1) == '/')
- $v_stored_filename = $p_add_dir.$v_stored_filename;
- else
- $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
- }
+ if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir)
+ $v_stored_filename = substr($p_filename, strlen($p_remove_dir));
+ }
+ $v_stored_filename = $this->_translateWinPath($v_stored_filename);
+ if ($p_add_dir != '') {
+ if (substr($p_add_dir, -1) == '/')
+ $v_stored_filename = $p_add_dir.$v_stored_filename;
+ else
+ $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
+ }
- $v_stored_filename = $this->_pathReduction($v_stored_filename);
+ $v_stored_filename = $this->_pathReduction($v_stored_filename);
+ }
if ($this->_isArchive($p_filename)) {
if (($v_file = @fopen($p_filename, "rb")) == 0) {
diff --git a/README b/README
index 7c60e81a7b..e11ff7d10c 100644
--- a/README
+++ b/README
@@ -11,3 +11,9 @@ IRC channel: https://webchat.freenode.net/?channels=owncloud
Diaspora: https://joindiaspora.com/u/owncloud
Identi.ca: https://identi.ca/owncloud
+Important notice on translations:
+Please submit translations via Transifex:
+https://www.transifex.com/projects/p/owncloud/
+
+For more detailed information about translations:
+http://owncloud.org/dev/translation/
\ No newline at end of file
diff --git a/apps/files/admin.php b/apps/files/admin.php
index 547f2bd7dd..e8b3cb0aca 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -63,4 +63,3 @@ $tmpl->assign( 'maxPossibleUploadSize', $maxUploadFilesizePossible);
$tmpl->assign( 'allowZipDownload', $allowZipDownload);
$tmpl->assign( 'maxZipInputSize', $maxZipInputSize);
return $tmpl->fetchPage();
-
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index f15cd51424..14482c5edb 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -89,4 +89,3 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
#scanning-message{ top:40%; left:40%; position:absolute; display:none; }
div.crumb a{ padding: 0.9em 0 0.7em 0; }
-
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 100a236872..870437ae67 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -150,7 +150,7 @@ var FileList={
if (newname != name) {
if (FileList.checkName(name, newname, false)) {
newname = name;
- } else {
+ } else {
$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(result) {
if (!result || result.status == 'error') {
OC.dialogs.alert(result.data.message, 'Error moving file');
@@ -158,7 +158,7 @@ var FileList={
}
tr.data('renaming',false);
});
-
+
}
}
tr.attr('data-file', newname);
@@ -264,9 +264,9 @@ var FileList={
if (FileList.lastAction) {
FileList.lastAction();
}
-
+
FileList.prepareDeletion(files);
-
+
if (!FileList.useUndo) {
FileList.lastAction();
} else {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index c5333f2faf..777a5ec647 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -199,7 +199,7 @@ $(document).ready(function() {
$(document).bind('drop dragover', function (e) {
e.preventDefault(); // prevent browser from doing anything, if file isn't dropped in dropZone
});
-
+
if ( document.getElementById("data-upload-form") ) {
$(function() {
$('.file_upload_start').fileupload({
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index fc07c9b911..d8b3cf4227 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -20,13 +20,13 @@
"unshared" => "Nicht mehr freigegeben",
"deleted" => "gelöscht",
"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
"Upload Error" => "Fehler beim Upload",
"Pending" => "Ausstehend",
"1 file uploading" => "Eine Datei wird hoch geladen",
"files uploading" => "Dateien werden hoch geladen",
"Upload cancelled." => "Upload abgebrochen.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
"Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
"files scanned" => "Dateien gescannt",
"error while scanning" => "Fehler beim Scannen",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
new file mode 100644
index 0000000000..2ed409d2a5
--- /dev/null
+++ b/apps/files/l10n/de_DE.php
@@ -0,0 +1,71 @@
+ "Datei fehlerfrei hochgeladen.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Die Größe der hochzuladenden Datei überschreitet die upload_max_filesize-Richtlinie in php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde",
+"The uploaded file was only partially uploaded" => "Die Datei wurde nur teilweise hochgeladen.",
+"No file was uploaded" => "Es wurde keine Datei hochgeladen.",
+"Missing a temporary folder" => "Temporärer Ordner fehlt.",
+"Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
+"Files" => "Dateien",
+"Unshare" => "Nicht mehr freigeben",
+"Delete" => "Löschen",
+"Rename" => "Umbenennen",
+"already exists" => "ist bereits vorhanden",
+"replace" => "ersetzen",
+"suggest name" => "Name vorschlagen",
+"cancel" => "abbrechen",
+"replaced" => "ersetzt",
+"undo" => "rückgängig machen",
+"with" => "mit",
+"unshared" => "Nicht mehr freigegeben",
+"deleted" => "gelöscht",
+"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist.",
+"Upload Error" => "Fehler beim Upload",
+"Pending" => "Ausstehend",
+"1 file uploading" => "Eine Datei wird hoch geladen",
+"files uploading" => "Dateien werden hoch geladen",
+"Upload cancelled." => "Upload abgebrochen.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+"Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
+"files scanned" => "Dateien gescannt",
+"error while scanning" => "Fehler beim Scannen",
+"Name" => "Name",
+"Size" => "Größe",
+"Modified" => "Bearbeitet",
+"folder" => "Ordner",
+"folders" => "Ordner",
+"file" => "Datei",
+"files" => "Dateien",
+"seconds ago" => "Sekunden her",
+"minute ago" => "Minute her",
+"minutes ago" => "Minuten her",
+"today" => "Heute",
+"yesterday" => "Gestern",
+"days ago" => "Tage her",
+"last month" => "Letzten Monat",
+"months ago" => "Monate her",
+"last year" => "Letztes Jahr",
+"years ago" => "Jahre her",
+"File handling" => "Dateibehandlung",
+"Maximum upload size" => "Maximale Upload-Größe",
+"max. possible: " => "maximal möglich:",
+"Needed for multi-file and folder downloads." => "Für Mehrfachdatei- und Ordnerdownloads benötigt:",
+"Enable ZIP-download" => "ZIP-Download aktivieren",
+"0 is unlimited" => "0 bedeutet unbegrenzt",
+"Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
+"Save" => "Speichern",
+"New" => "Neu",
+"Text file" => "Textdatei",
+"Folder" => "Ordner",
+"From url" => "Von einer URL",
+"Upload" => "Hochladen",
+"Cancel upload" => "Upload abbrechen",
+"Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
+"Share" => "Teilen",
+"Download" => "Herunterladen",
+"Upload too large" => "Upload zu groß",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
+"Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
+"Current scanning" => "Scanne"
+);
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 03d4458744..e9d8eb9e9a 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -9,6 +9,7 @@
"Files" => "Dosieroj",
"Unshare" => "Malkunhavigi",
"Delete" => "Forigi",
+"Rename" => "Alinomigi",
"already exists" => "jam ekzistas",
"replace" => "anstataŭigi",
"suggest name" => "sugesti nomon",
@@ -22,9 +23,13 @@
"Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
"Upload Error" => "Alŝuta eraro",
"Pending" => "Traktotaj",
+"1 file uploading" => "1 dosiero estas alŝutata",
+"files uploading" => "dosieroj estas alŝutataj",
"Upload cancelled." => "La alŝuto nuliĝis.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
"Invalid name, '/' is not allowed." => "Nevalida nomo, “/” ne estas permesata.",
+"files scanned" => "dosieroj skanitaj",
+"error while scanning" => "eraro dum skano",
"Name" => "Nomo",
"Size" => "Grando",
"Modified" => "Modifita",
@@ -32,6 +37,16 @@
"folders" => "dosierujoj",
"file" => "dosiero",
"files" => "dosieroj",
+"seconds ago" => "sekundoj antaŭe",
+"minute ago" => "minuto antaŭe",
+"minutes ago" => "minutoj antaŭe",
+"today" => "hodiaŭ",
+"yesterday" => "hieraŭ",
+"days ago" => "tagoj antaŭe",
+"last month" => "lastamonate",
+"months ago" => "monatoj antaŭe",
+"last year" => "lastajare",
+"years ago" => "jaroj antaŭe",
"File handling" => "Dosieradministro",
"Maximum upload size" => "Maksimuma alŝutogrando",
"max. possible: " => "maks. ebla: ",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index cda1d51ed2..f1cd054b1d 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -7,20 +7,29 @@
"Missing a temporary folder" => "Mangler en midlertidig mappe",
"Failed to write to disk" => "Klarte ikke å skrive til disk",
"Files" => "Filer",
+"Unshare" => "Avslutt deling",
"Delete" => "Slett",
+"Rename" => "Omdøp",
"already exists" => "eksisterer allerede",
"replace" => "erstatt",
+"suggest name" => "foreslå navn",
"cancel" => "avbryt",
"replaced" => "erstattet",
"undo" => "angre",
"with" => "med",
+"unshared" => "deling avsluttet",
"deleted" => "slettet",
"generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
"Upload Error" => "Opplasting feilet",
"Pending" => "Ventende",
+"1 file uploading" => "1 fil lastes opp",
+"files uploading" => "filer lastes opp",
"Upload cancelled." => "Opplasting avbrutt.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
"Invalid name, '/' is not allowed." => "Ugyldig navn, '/' er ikke tillatt. ",
+"files scanned" => "Filer skannet",
+"error while scanning" => "feil under skanning",
"Name" => "Navn",
"Size" => "Størrelse",
"Modified" => "Endret",
@@ -28,6 +37,16 @@
"folders" => "mapper",
"file" => "fil",
"files" => "filer",
+"seconds ago" => "sekunder siden",
+"minute ago" => "minutt siden",
+"minutes ago" => "minutter siden",
+"today" => "i dag",
+"yesterday" => "i går",
+"days ago" => "dager siden",
+"last month" => "forrige måned",
+"months ago" => "måneder siden",
+"last year" => "forrige år",
+"years ago" => "år siden",
"File handling" => "Filhåndtering",
"Maximum upload size" => "Maksimum opplastingsstørrelse",
"max. possible: " => "max. mulige:",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 016f7341ab..5f7f03a3d8 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -23,6 +23,8 @@
"Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
"Upload Error" => "Upload Fout",
"Pending" => "Wachten",
+"1 file uploading" => "1 bestand wordt ge-upload",
+"files uploading" => "Bestanden aan het uploaden",
"Upload cancelled." => "Uploaden geannuleerd.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
"Invalid name, '/' is not allowed." => "Ongeldige naam, '/' is niet toegestaan.",
@@ -35,6 +37,16 @@
"folders" => "mappen",
"file" => "bestand",
"files" => "bestanden",
+"seconds ago" => "seconden geleden",
+"minute ago" => "minuut geleden",
+"minutes ago" => "minuten geleden",
+"today" => "vandaag",
+"yesterday" => "gisteren",
+"days ago" => "dagen geleden",
+"last month" => "vorige maand",
+"months ago" => "maanden geleden",
+"last year" => "vorig jaar",
+"years ago" => "jaar geleden",
"File handling" => "Bestand",
"Maximum upload size" => "Maximale bestandsgrootte voor uploads",
"max. possible: " => "max. mogelijk: ",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index d21d6e3a6d..64010937fd 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -9,6 +9,7 @@
"Files" => "Файлы",
"Unshare" => "Отменить публикацию",
"Delete" => "Удалить",
+"Rename" => "Переименовать",
"already exists" => "уже существует",
"replace" => "заменить",
"suggest name" => "предложить название",
@@ -22,6 +23,8 @@
"Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
"Upload Error" => "Ошибка загрузки",
"Pending" => "Ожидание",
+"1 file uploading" => "загружается 1 файл",
+"files uploading" => "загружаются файлы",
"Upload cancelled." => "Загрузка отменена.",
"File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.",
"Invalid name, '/' is not allowed." => "Неверное имя, '/' не допускается.",
@@ -32,6 +35,10 @@
"folders" => "папки",
"file" => "файл",
"files" => "файлы",
+"minute ago" => "минуту назад",
+"today" => "сегодня",
+"yesterday" => "вчера",
+"last month" => "в прошлом месяце",
"File handling" => "Управление файлами",
"Maximum upload size" => "Максимальный размер загружаемого файла",
"max. possible: " => "макс. возможно: ",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
new file mode 100644
index 0000000000..97a125faff
--- /dev/null
+++ b/apps/files/l10n/si_LK.php
@@ -0,0 +1,18 @@
+ "නිවැරදි ව ගොනුව උඩුගත කෙරිනි",
+"The uploaded file was only partially uploaded" => "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
+"No file was uploaded" => "කිසිදු ගොනවක් උඩුගත නොවිනි",
+"Files" => "ගොනු",
+"Name" => "නම",
+"Size" => "ප්රමාණය",
+"folder" => "ෆෝල්ඩරය",
+"folders" => "ෆෝල්ඩර",
+"file" => "ගොනුව",
+"files" => "ගොනු",
+"Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්රමාණය",
+"New" => "නව",
+"Folder" => "ෆෝල්ඩරය",
+"Upload" => "උඩුගත කිරීම",
+"Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
+"Download" => "බාගත කිරීම"
+);
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 7f8c35650d..787e903ac8 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -21,11 +21,11 @@
"deleted" => "zmazané",
"generating ZIP-file, it may take some time." => "generujem ZIP-súbor, môže to chvíľu trvať.",
"Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
-"Upload Error" => "Chyba nahrávania",
+"Upload Error" => "Chyba odosielania",
"Pending" => "Čaká sa",
"1 file uploading" => "1 súbor sa posiela ",
"files uploading" => "súbory sa posielajú",
-"Upload cancelled." => "Nahrávanie zrušené",
+"Upload cancelled." => "Odosielanie zrušené",
"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
"Invalid name, '/' is not allowed." => "Chybný názov, \"/\" nie je povolené",
"files scanned" => "skontrolovaných súborov",
@@ -59,13 +59,13 @@
"Text file" => "Textový súbor",
"Folder" => "Priečinok",
"From url" => "Z url",
-"Upload" => "Nahrať",
+"Upload" => "Odoslať",
"Cancel upload" => "Zrušiť odosielanie",
"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
"Share" => "Zdielať",
"Download" => "Stiahnuť",
"Upload too large" => "Odosielaný súbor je príliš veľký",
"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
-"Files are being scanned, please wait." => "Súbory sa práve prehľadávajú, prosím čakajte.",
+"Files are being scanned, please wait." => "Čakajte, súbory sú prehľadávané..",
"Current scanning" => "Práve prehliadané"
);
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index d6593022d8..a519c1a2ba 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -9,6 +9,7 @@
"Files" => "Tập tin",
"Unshare" => "Không chia sẽ",
"Delete" => "Xóa",
+"Rename" => "Sửa tên",
"already exists" => "đã tồn tại",
"replace" => "thay thế",
"suggest name" => "tên gợi ý",
@@ -16,14 +17,19 @@
"replaced" => "đã được thay thế",
"undo" => "lùi lại",
"with" => "với",
+"unshared" => "gỡ chia sẻ",
"deleted" => "đã xóa",
"generating ZIP-file, it may take some time." => "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian",
"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte",
"Upload Error" => "Tải lên lỗi",
"Pending" => "Chờ",
+"1 file uploading" => "1 tệp tin đang được tải lên",
+"files uploading" => "tệp tin đang được tải lên",
"Upload cancelled." => "Hủy tải lên",
"File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
"Invalid name, '/' is not allowed." => "Tên không hợp lệ ,không được phép dùng '/'",
+"files scanned" => "tệp tin đã quét",
+"error while scanning" => "lỗi trong khi quét",
"Name" => "Tên",
"Size" => "Kích cỡ",
"Modified" => "Thay đổi",
@@ -31,8 +37,19 @@
"folders" => "folders",
"file" => "file",
"files" => "files",
+"seconds ago" => "giây trước",
+"minute ago" => "một phút trước",
+"minutes ago" => "phút trước",
+"today" => "hôm nay",
+"yesterday" => "hôm qua",
+"days ago" => "ngày trước",
+"last month" => "tháng trước",
+"months ago" => "tháng trước",
+"last year" => "năm trước",
+"years ago" => "năm trước",
"File handling" => "Xử lý tập tin",
"Maximum upload size" => "Kích thước tối đa ",
+"max. possible: " => "tối đa cho phép",
"Needed for multi-file and folder downloads." => "Cần thiết cho tải nhiều tập tin và thư mục.",
"Enable ZIP-download" => "Cho phép ZIP-download",
"0 is unlimited" => "0 là không giới hạn",
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 1329b5dc5c..0f5b839b18 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -6,7 +6,7 @@
}
?>
-
+
"Verschlüsselung",
+"Exclude the following file types from encryption" => "Die folgenden Dateitypen von der Verschlüsselung ausnehmen",
+"None" => "Keine",
+"Enable Encryption" => "Verschlüsselung aktivieren"
+);
diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php
index 6871b0fd1d..664b3937e9 100644
--- a/apps/files_external/ajax/removeRootCertificate.php
+++ b/apps/files_external/ajax/removeRootCertificate.php
@@ -11,4 +11,3 @@ if ( $view->file_exists($file) ) {
$view->unlink($file);
OC_Mount_Config::createCertificateBundle();
}
-
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
new file mode 100644
index 0000000000..5d57e5e459
--- /dev/null
+++ b/apps/files_external/l10n/de_DE.php
@@ -0,0 +1,24 @@
+ "Zugriff gestattet",
+"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
+"Grant access" => "Zugriff gestatten",
+"Fill out all required fields" => "Bitte alle notwendigen Felder füllen",
+"Please provide a valid Dropbox app key and secret." => "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
+"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
+"External Storage" => "Externer Speicher",
+"Mount point" => "Mount-Point",
+"Backend" => "Backend",
+"Configuration" => "Konfiguration",
+"Options" => "Optionen",
+"Applicable" => "Zutreffend",
+"Add mount point" => "Mount-Point hinzufügen",
+"None set" => "Nicht definiert",
+"All Users" => "Alle Benutzer",
+"Groups" => "Gruppen",
+"Users" => "Benutzer",
+"Delete" => "Löschen",
+"Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
+"Allow users to mount their own external storage" => "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Import Root Certificate" => "Root-Zertifikate importieren"
+);
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index c518fca149..a1dae9d488 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -1,4 +1,10 @@
"Προσβαση παρασχέθηκε",
+"Error configuring Dropbox storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
+"Grant access" => "Παροχή πρόσβασης",
+"Fill out all required fields" => "Συμπληρώστε όλα τα απαιτούμενα πεδία",
+"Please provide a valid Dropbox app key and secret." => "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
+"Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
"External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
"Mount point" => "Σημείο προσάρτησης",
"Backend" => "Σύστημα υποστήριξης",
@@ -7,7 +13,7 @@
"Applicable" => "Εφαρμόσιμο",
"Add mount point" => "Προσθήκη σημείου προσάρτησης",
"None set" => "Κανένα επιλεγμένο",
-"All Users" => "Όλοι οι χρήστες",
+"All Users" => "Όλοι οι Χρήστες",
"Groups" => "Ομάδες",
"Users" => "Χρήστες",
"Delete" => "Διαγραφή",
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
index 90819e3352..97453aafed 100644
--- a/apps/files_external/l10n/eo.php
+++ b/apps/files_external/l10n/eo.php
@@ -1,4 +1,10 @@
"Alirpermeso donita",
+"Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox",
+"Grant access" => "Doni alirpermeson",
+"Fill out all required fields" => "Plenigu ĉiujn neprajn kampojn",
+"Please provide a valid Dropbox app key and secret." => "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan.",
+"Error configuring Google Drive storage" => "Eraro dum agordado de la memorservo Google Drive",
"External Storage" => "Malena memorilo",
"Mount point" => "Surmetingo",
"Backend" => "Motoro",
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
index 04257a8014..04d5e3c7ee 100644
--- a/apps/files_external/l10n/sk_SK.php
+++ b/apps/files_external/l10n/sk_SK.php
@@ -1,5 +1,6 @@
"Prístup povolený",
+"Error configuring Dropbox storage" => "Chyba pri konfigurácii úložiska Dropbox",
"Grant access" => "Povoliť prístup",
"Fill out all required fields" => "Vyplňte všetky vyžadované kolónky",
"Please provide a valid Dropbox app key and secret." => "Zadajte platný kľúč aplikácie a heslo Dropbox",
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 3ba86cf148..c68369c72b 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -120,10 +120,10 @@ class OC_Mount_Config {
$dir = $dir.'/'.$pathPart;
if ( !$view->file_exists($dir)) {
$view->mkdir($dir);
- }
+ }
}
}
-
+
/**
* Add a mount point to the filesystem
@@ -160,7 +160,7 @@ class OC_Mount_Config {
self::addMountPointDirectory($view, $path);
}
break;
- case 'group' :
+ case 'group' :
$groupMembers = OC_Group::usersInGroups(array($applicable));
foreach ( $groupMembers as $user ) {
$path = $user.'/files/'.ltrim($mountPoint, '/');
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
new file mode 100644
index 0000000000..c2fec21545
--- /dev/null
+++ b/apps/files_sharing/l10n/de_DE.php
@@ -0,0 +1,9 @@
+ "Passwort",
+"Submit" => "Absenden",
+"%s shared the folder %s with you" => "%s hat den Ordner %s für dich freigegeben",
+"%s shared the file %s with you" => "%s hat die Datei %s für dich freigegeben",
+"Download" => "Download",
+"No preview available for" => "Es ist keine Vorschau verfügbar für",
+"web services under your control" => "Web-Services unter Deiner Kontrolle"
+);
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index e71715f0f1..c598d3aa2c 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,6 +1,8 @@
"Pasvorto",
"Submit" => "Sendi",
+"%s shared the folder %s with you" => "%s kunhavigis la dosierujon %s kun vi",
+"%s shared the file %s with you" => "%s kunhavigis la dosieron %s kun vi",
"Download" => "Elŝuti",
"No preview available for" => "Ne haveblas antaŭvido por",
"web services under your control" => "TTT-servoj regataj de vi"
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index e29e9b7e00..bddda99f8b 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -59,7 +59,7 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
$parents = array();
while ($file = $result->fetchRow()) {
$children[] = array('source' => $file['id'], 'file_path' => $file['name']);
- // If a child folder is found look inside it
+ // If a child folder is found look inside it
if ($file['mimetype'] == 'httpd/unix-directory') {
$parents[] = $file['id'];
}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 96d0f0de05..a71d9d8d9c 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -24,12 +24,12 @@ if (isset($_GET['token'])) {
if (isset($_GET['file']) || isset($_GET['dir'])) {
if (isset($_GET['dir'])) {
$type = 'folder';
- $path = $_GET['dir'];
+ $path = OC_Filesystem::normalizePath($_GET['dir']);
$baseDir = $path;
$dir = $baseDir;
} else {
$type = 'file';
- $path = $_GET['file'];
+ $path = OC_Filesystem::normalizePath($_GET['file']);
}
$uidOwner = substr($path, 1, strpos($path, '/', 1) - 1);
if (OCP\User::userExists($uidOwner)) {
@@ -45,10 +45,10 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
}
if (isset($linkItem['share_with'])) {
// Check password
- if (isset($_GET['file'])) {
- $url = OCP\Util::linkToPublic('files').'&file='.$_GET['file'];
- } else {
- $url = OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'];
+ if (isset($_GET['file'])) {
+ $url = OCP\Util::linkToPublic('files').'&file='.$_GET['file'];
+ } else {
+ $url = OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'];
}
if (isset($_POST['password'])) {
$password = $_POST['password'];
@@ -98,7 +98,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
} else { // download a single shared file
OC_Files::get("", $path, $_SERVER['REQUEST_METHOD'] == 'HEAD' ? true : false);
}
-
+
} else {
OCP\Util::addStyle('files_sharing', 'public');
OCP\Util::addScript('files_sharing', 'public');
@@ -134,7 +134,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) {
if ($i != '') {
if ($i != $baseDir) {
$pathtohere .= '/'.$i;
- }
+ }
if ( strlen($pathtohere) < strlen($_GET['dir'])) {
continue;
}
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 07c5655560..426d521df8 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -68,7 +68,7 @@ function createVersionsDropdown(filename, files) {
data: { source: files },
async: false,
success: function( versions ) {
-
+
if (versions) {
$.each( versions, function(index, row ) {
addVersion( row );
@@ -128,7 +128,7 @@ function createVersionsDropdown(filename, files) {
version.appendTo('#found_versions');
}
-
+
$('tr').filterAttr('data-file',filename).addClass('mouseOver');
$('#dropdown').show('blind');
@@ -144,6 +144,6 @@ $(this).click(
});
}
-
+
}
);
diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php
new file mode 100644
index 0000000000..092bbfbff7
--- /dev/null
+++ b/apps/files_versions/l10n/de_DE.php
@@ -0,0 +1,8 @@
+ "Alle Versionen löschen",
+"History" => "Historie",
+"Versions" => "Versionen",
+"This will delete all existing backup versions of your files" => "Dies löscht alle vorhandenen Sicherungsversionen Deiner Dateien.",
+"Files Versioning" => "Dateiversionierung",
+"Enable" => "Aktivieren"
+);
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
index d0f89c576d..0c3835373e 100644
--- a/apps/files_versions/l10n/eo.php
+++ b/apps/files_versions/l10n/eo.php
@@ -1,5 +1,8 @@
"Eksvalidigi ĉiujn eldonojn",
+"History" => "Historio",
"Versions" => "Eldonoj",
-"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj"
+"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj",
+"Files Versioning" => "Dosiereldonigo",
+"Enable" => "Kapabligi"
);
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index 992c0751d0..a92e85a017 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -1,5 +1,8 @@
"Hết hạn tất cả các phiên bản",
+"History" => "Lịch sử",
"Versions" => "Phiên bản",
-"This will delete all existing backup versions of your files" => "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có "
+"This will delete all existing backup versions of your files" => "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có ",
+"Files Versioning" => "Phiên bản tệp tin",
+"Enable" => "Kích hoạtLịch sử"
);
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index fdbe374e74..52a10f77d7 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -58,8 +58,10 @@ class Storage {
public function store($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);
- $files_view = new \OC\Files\View('/'.$uid.'/files');
- $users_view = new \OC\Files\View('/'.$uid);
+
+ $userHome = \OC_User::getHome($uid);
+ $files_view = new \OC\Files\View($userHome.'/files');
+ $users_view = new \OC\Files\View($userHome);
//check if source file already exist as version to avoid recursions.
// todo does this check work?
@@ -94,7 +96,7 @@ class Storage {
// check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
if ($uid == \OCP\User::getUser()) {
- $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
+ $versions_fileview = new \OC\Files\View($userHome.'/files_versions');
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
$matches=glob($versionsFolderName.'/'.$filename.'.v*');
sort($matches);
@@ -106,7 +108,7 @@ class Storage {
// create all parent folders
- $info=pathinfo($filename);
+ $info=pathinfo($filename);
if(!file_exists($versionsFolderName.'/'.$info['dirname'])) {
mkdir($versionsFolderName.'/'.$info['dirname'],0750,true);
}
@@ -127,7 +129,7 @@ class Storage {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);
- $users_view = new \OC\Files\View('/'.$uid);
+ $users_view = new \OC\Files\View(\OC_User::getHome($uid));
// rollback
if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
@@ -150,7 +152,7 @@ class Storage {
public static function isversioned($filename) {
if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
list($uid, $filename) = self::getUidAndFilename($filename);
- $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
+ $versions_fileview = new \OC\Files\View(\OC_User::getHome($uid).'/files_versions');
$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
@@ -178,7 +180,7 @@ class Storage {
if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
list($uid, $filename) = self::getUidAndFilename($filename);
- $versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
+ $versions_fileview = new \OC\Files\View(\OC_User::getHome($uid).'/files_versions');
$versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
$versions = array();
@@ -190,7 +192,7 @@ class Storage {
$i = 0;
- $files_view = new \OC\Files\View('/'.$uid.'/files');
+ $files_view = new \OC\Files\View(\OC_User::getHome($uid).'/files');
$local_file = $files_view->getLocalFile($filename);
foreach( $matches as $ma ) {
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
new file mode 100644
index 0000000000..97debcbab6
--- /dev/null
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -0,0 +1,37 @@
+ "Host",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne dann mit ldaps://",
+"Base DN" => "Basis-DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
+"User DN" => "Benutzer-DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer.",
+"Password" => "Passwort",
+"For anonymous access, leave DN and Password empty." => "Lasse die Felder von DN und Passwort für anonymen Zugang leer.",
+"User Login Filter" => "Benutzer-Login-Filter",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "verwende %%uid Platzhalter, z. B. \"uid=%%uid\"",
+"User List Filter" => "Benutzer-Filter-Liste",
+"Defines the filter to apply, when retrieving users." => "Definiert den Filter für die Anfrage der Benutzer.",
+"without any placeholder, e.g. \"objectClass=person\"." => "ohne Platzhalter, z.B.: \"objectClass=person\"",
+"Group Filter" => "Gruppen-Filter",
+"Defines the filter to apply, when retrieving groups." => "Definiert den Filter für die Anfrage der Gruppen.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
+"Port" => "Port",
+"Base User Tree" => "Basis-Benutzerbaum",
+"Base Group Tree" => "Basis-Gruppenbaum",
+"Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
+"Use TLS" => "Nutze TLS",
+"Do not use it for SSL connections, it will fail." => "Verwende dies nicht für SSL-Verbindungen, es wird fehlschlagen.",
+"Case insensitve LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
+"Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden.",
+"Not recommended, use for testing only." => "Nicht empfohlen, nur zu Testzwecken.",
+"User Display Name Field" => "Feld für den Anzeigenamen des Benutzers",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. ",
+"Group Display Name Field" => "Feld für den Anzeigenamen der Gruppe",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. ",
+"in bytes" => "in Bytes",
+"in seconds. A change empties the cache." => "in Sekunden. Eine Änderung leert den Cache.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein.",
+"Help" => "Hilfe"
+);
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 683c60ef84..ef8aff8a39 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -22,6 +22,7 @@
"Do not use it for SSL connections, it will fail." => "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos.",
"Case insensitve LDAP server (Windows)" => "LDAP-servilo blinda je litergrandeco (Vindozo)",
"Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Se la konekto nur funkcias kun ĉi tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo.",
"Not recommended, use for testing only." => "Ne rekomendata, uzu ĝin nur por testoj.",
"User Display Name Field" => "Kampo de vidignomo de uzanto",
"The LDAP attribute to use to generate the user`s ownCloud name." => "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto.",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index bf32a29537..a85b2a6f1b 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -1,10 +1,18 @@
"Anfitrião",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
+"Base DN" => "DN base",
"You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar o ND Base para utilizadores e grupos no separador Avançado",
+"User DN" => "DN do utilizador",
"Password" => "Palavra-passe",
+"For anonymous access, leave DN and Password empty." => "Para acesso anónimo, deixe DN e a Palavra-passe vazios.",
"Group Filter" => "Filtrar por grupo",
"Port" => "Porto",
+"Use TLS" => "Usar TLS",
+"Do not use it for SSL connections, it will fail." => "Não use para ligações SSL, irá falhar.",
+"Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.",
"in bytes" => "em bytes",
"in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
"Help" => "Ajuda"
);
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index 8433f39e83..d5adb9fffd 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -4,23 +4,31 @@
"Base DN" => "База DN",
"You can specify Base DN for users and groups in the Advanced tab" => "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»",
"User DN" => "DN пользователя",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми.",
"Password" => "Пароль",
"For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте поля DN и пароль пустыми.",
"User Login Filter" => "Фильтр имен пользователей",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе.",
"use %%uid placeholder, e.g. \"uid=%%uid\"" => "используйте %%uid заполнитель, например, \"uid=%%uid\"",
+"User List Filter" => "Фильтр списка пользователей",
+"Defines the filter to apply, when retrieving users." => "Задает фильтр, применяемый при получении пользователей.",
"without any placeholder, e.g. \"objectClass=person\"." => "без каких-либо заполнителей, например, \"objectClass=person\".",
"Group Filter" => "Групповой фильтр",
+"Defines the filter to apply, when retrieving groups." => "Задает фильтр, применяемый при получении групп.",
"without any placeholder, e.g. \"objectClass=posixGroup\"." => "без каких-либо заполнителей, например, \"objectClass=posixGroup\".",
"Port" => "Порт",
"Base User Tree" => "Базовое дерево пользователей",
+"Base Group Tree" => "Базовое дерево групп",
"Group-Member association" => "Связь член-группа",
"Use TLS" => "Использовать TLS",
"Do not use it for SSL connections, it will fail." => "Не используйте это SSL-соединений, это не будет выполнено.",
"Case insensitve LDAP server (Windows)" => "Нечувствительный к регистру LDAP-сервер (Windows)",
"Turn off SSL certificate validation." => "Выключить проверку сертификата SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер.",
"Not recommended, use for testing only." => "Не рекомендовано, используйте только для тестирования.",
"User Display Name Field" => "Поле, отображаемое как имя пользователя",
"The LDAP attribute to use to generate the user`s ownCloud name." => "Атрибут LDAP, используемый для создания имени пользователя в ownCloud.",
+"Group Display Name Field" => "Поле, отображаемое как имя группы",
"The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP, используемый для создания группового имени в ownCloud.",
"in bytes" => "в байтах",
"in seconds. A change empties the cache." => "в секундах. Изменение очищает кэш.",
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 66007d0953..a500e1bf5b 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -339,7 +339,8 @@ abstract class Access {
$ownCloudNames = array();
foreach($ldapObjects as $ldapObject) {
- $ocname = $this->dn2ocname($ldapObject['dn'], $ldapObject[$nameAttribute], $isUsers);
+ $nameByLDAP = isset($ldapObject[$nameAttribute]) ? $ldapObject[$nameAttribute] : null;
+ $ocname = $this->dn2ocname($ldapObject['dn'], $nameByLDAP, $isUsers);
if($ocname) {
$ownCloudNames[] = $ocname;
}
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 53a6512910..e104c8d176 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -29,11 +29,13 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
private function updateQuota($dn) {
$quota = null;
- if(!empty($this->connection->ldapQuotaDefault)) {
- $quota = $this->connection->ldapQuotaDefault;
+ $quotaDefault = $this->connection->ldapQuotaDefault;
+ $quotaAttribute = $this->connection->ldapQuotaAttribute;
+ if(!empty($quotaDefault)) {
+ $quota = $quotaDefault;
}
- if(!empty($this->connection->ldapQuotaAttribute)) {
- $aQuota = $this->readAttribute($dn, $this->connection->ldapQuotaAttribute);
+ if(!empty($quotaAttribute)) {
+ $aQuota = $this->readAttribute($dn, $quotaAttribute);
if($aQuota && (count($aQuota) > 0)) {
$quota = $aQuota[0];
@@ -46,8 +48,9 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
private function updateEmail($dn) {
$email = null;
- if(!empty($this->connection->ldapEmailAttribute)) {
- $aEmail = $this->readAttribute($dn, $this->connection->ldapEmailAttribute);
+ $emailAttribute = $this->connection->ldapEmailAttribute;
+ if(!empty($emailAttribute)) {
+ $aEmail = $this->readAttribute($dn, $emailAttribute);
if($aEmail && (count($aEmail) > 0)) {
$email = $aEmail[0];
}
diff --git a/config/config.sample.php b/config/config.sample.php
index 09eb6053c2..3d0a70db1d 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -30,6 +30,12 @@ $CONFIG = array(
/* Force use of HTTPS connection (true = use HTTPS) */
"forcessl" => false,
+/* Enhanced auth forces users to enter their password again when performing potential sensitive actions like creating or deleting users */
+"enhancedauth" => true,
+
+/* Time in seconds how long an user is authenticated without entering his password again before performing sensitive actions like creating or deleting users etc...*/
+"enhancedauthtime" => 15 * 60,
+
/* Theme to use for ownCloud */
"theme" => "",
@@ -86,6 +92,9 @@ $CONFIG = array(
/* Loglevel to start logging at. 0=DEBUG, 1=INFO, 2=WARN, 3=ERROR (default is WARN) */
"loglevel" => "",
+/* Lifetime of the remember login cookie, default is 15 days */
+"remember_login_cookie_lifetime" => 60*60*24*15,
+
/* The directory where the user data is stored, default to data in the owncloud
* directory. The sqlite database is also stored here, when sqlite is used.
*/
@@ -104,4 +113,4 @@ $CONFIG = array(
'writable' => true,
),
),
-);
\ No newline at end of file
+);
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 70286040bf..d329b92030 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -69,6 +69,10 @@
"Cloud not found" => "No s'ha trobat el núvol",
"Edit categories" => "Edita les categories",
"Add" => "Afegeix",
+"Security Warning" => "Avís de seguretat",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No està disponible el generador de nombres aleatoris segurs, habiliteu l'extensió de PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sense un generador de nombres aleatoris segurs un atacant podria predir els senyals per restablir la contrasenya i prendre-us el compte.",
+"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." => "La carpeta de dades i els fitxers provablement són accessibles des d'internet. El fitxer .htaccess que proporciona ownCloud no funciona. Us recomanem que configureu el vostre servidor web de manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de la carpeta arrel del servidor web.",
"Create an admin account" => "Crea un compte d'administrador",
"Advanced" => "Avançat",
"Data folder" => "Carpeta de dades",
@@ -82,10 +86,16 @@
"Finish setup" => "Acaba la configuració",
"web services under your control" => "controleu els vostres serveis web",
"Log out" => "Surt",
+"Automatic logon rejected!" => "L'ha rebutjat l'acceditació automàtica!",
+"If you did not change your password recently, your account may be compromised!" => "Se no heu canviat la contrasenya recentment el vostre compte pot estar compromès!",
+"Please change your password to secure your account again." => "Canvieu la contrasenya de nou per assegurar el vostre compte.",
"Lost your password?" => "Heu perdut la contrasenya?",
"remember" => "recorda'm",
"Log in" => "Inici de sessió",
"You are logged out." => "Heu tancat la sessió.",
"prev" => "anterior",
-"next" => "següent"
+"next" => "següent",
+"Security Warning!" => "Avís de seguretat!",
+"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Comproveu la vostra contrasenya.
Per raons de seguretat se us pot demanar escriure de nou la vostra contrasenya.",
+"Verify" => "Comprova"
);
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 461bed9933..a6e0d42dac 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -69,6 +69,10 @@
"Cloud not found" => "Cloud nebyl nalezen",
"Edit categories" => "Upravit kategorie",
"Add" => "Přidat",
+"Security Warning" => "Bezpečnostní upozornění",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Není dostupný žádný bezpečný generátor náhodných čísel. Povolte, prosím, rozšíření OpenSSL v PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Bez bezpečného generátoru náhodných čísel může útočník předpovědět token pro obnovu hesla a převzít kontrolu nad Vaším účtem.",
+"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." => "Váš adresář dat a všechny Vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess, který je poskytován ownCloud, nefunguje. Důrazně Vám doporučujeme nastavit váš webový server tak, aby nebyl adresář dat přístupný, nebo přesunout adresář dat mimo kořenovou složku dokumentů webového serveru.",
"Create an admin account" => "Vytvořit účet správce",
"Advanced" => "Pokročilé",
"Data folder" => "Složka s daty",
@@ -82,10 +86,16 @@
"Finish setup" => "Dokončit nastavení",
"web services under your control" => "webové služby pod Vaší kontrolou",
"Log out" => "Odhlásit se",
+"Automatic logon rejected!" => "Automatické přihlášení odmítnuto.",
+"If you did not change your password recently, your account may be compromised!" => "V nedávné době jste nezměnili své heslo, Váš účet může být kompromitován.",
+"Please change your password to secure your account again." => "Změňte, prosím, své heslo pro opětovné zabezpečení Vašeho účtu.",
"Lost your password?" => "Ztratili jste své heslo?",
"remember" => "zapamatovat si",
"Log in" => "Přihlásit",
"You are logged out." => "Jste odhlášeni.",
"prev" => "předchozí",
-"next" => "následující"
+"next" => "následující",
+"Security Warning!" => "Bezpečnostní upozornění.",
+"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Ověřte, prosím, své heslo.
Z bezpečnostních důvodů můžete být občas požádáni o jeho opětovné zadání.",
+"Verify" => "Ověřit"
);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 31cfa764f9..cb6df3b6d1 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -69,6 +69,10 @@
"Cloud not found" => "Cloud nicht gefunden",
"Edit categories" => "Kategorien bearbeiten",
"Add" => "Hinzufügen",
+"Security Warning" => "Sicherheitswarnung",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Es ist kein sicherer Zufallszahlengenerator verfügbar, bitte aktiviere 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 Konten zu übernehmen.",
+"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." => "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus erreichbar. Die .htaccess Datei, die ownCloud verwendet, arbeitet nicht richtig. Wir schlagen Dir dringend vor, dass du deinen Webserver so konfigurierst, dass das Datenverzeichnis nicht länger erreichbar ist oder, dass du dein Datenverzeichnis aus dem Dokumenten-root des Webservers bewegst.",
"Create an admin account" => "Administrator-Konto anlegen",
"Advanced" => "Fortgeschritten",
"Data folder" => "Datenverzeichnis",
@@ -82,10 +86,16 @@
"Finish setup" => "Installation abschließen",
"web services under your control" => "Web-Services unter Ihrer Kontrolle",
"Log out" => "Abmelden",
+"Automatic logon rejected!" => "Automatischer Login zurückgewiesen!",
+"If you did not change your password recently, your account may be compromised!" => "Wenn du Dein Passwort nicht änderst, könnte dein Account kompromitiert werden!",
+"Please change your password to secure your account again." => "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen.",
"Lost your password?" => "Passwort vergessen?",
"remember" => "merken",
"Log in" => "Einloggen",
"You are logged out." => "Du wurdest abgemeldet.",
"prev" => "Zurück",
-"next" => "Weiter"
+"next" => "Weiter",
+"Security Warning!" => "Sicherheitswarnung!",
+"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Bitte bestätige Dein Passwort.
Aus Sicherheitsgründen wirst Du hierbei gebeten, Dein Passwort erneut einzugeben.",
+"Verify" => "Bestätigen"
);
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
new file mode 100644
index 0000000000..1d2daeef03
--- /dev/null
+++ b/core/l10n/de_DE.php
@@ -0,0 +1,94 @@
+ "Der Anwendungsname wurde nicht angegeben.",
+"No category to add?" => "Keine Kategorie hinzuzufügen?",
+"This category already exists: " => "Kategorie existiert bereits:",
+"Settings" => "Einstellungen",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "März",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
+"Choose" => "Auswählen",
+"Cancel" => "Abbrechen",
+"No" => "Nein",
+"Yes" => "Ja",
+"Ok" => "OK",
+"No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
+"Error" => "Fehler",
+"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" => "Für Dich und folgende Gruppe freigegeben",
+"by" => "mit",
+"Shared with you by" => "Dies wurde mit dir geteilt von",
+"Share with" => "Freigeben für",
+"Share with link" => "Über einen Link freigeben",
+"Password protect" => "Passwortschutz",
+"Password" => "Passwort",
+"Set expiration date" => "Setze ein Ablaufdatum",
+"Expiration date" => "Ablaufdatum",
+"Share via email:" => "Über eine E-Mail freigeben:",
+"No people found" => "Niemand gefunden",
+"Resharing is not allowed" => "Weiterverteilen ist nicht erlaubt",
+"Shared in" => "Freigegeben in",
+"with" => "mit",
+"Unshare" => "Freigabe aufheben",
+"can edit" => "kann bearbeiten",
+"access control" => "Zugriffskontrolle",
+"create" => "erstellen",
+"update" => "aktualisieren",
+"delete" => "löschen",
+"share" => "teilen",
+"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.",
+"Requested" => "Angefragt",
+"Login failed!" => "Login fehlgeschlagen!",
+"Username" => "Benutzername",
+"Request reset" => "Beantrage Zurücksetzung",
+"Your password was reset" => "Ihr Passwort wurde zurückgesetzt.",
+"To login page" => "Zur Login-Seite",
+"New password" => "Neues Passwort",
+"Reset password" => "Passwort zurücksetzen",
+"Personal" => "Persönlich",
+"Users" => "Benutzer",
+"Apps" => "Anwendungen",
+"Admin" => "Admin",
+"Help" => "Hilfe",
+"Access forbidden" => "Zugriff verboten",
+"Cloud not found" => "Cloud nicht gefunden",
+"Edit categories" => "Kategorien bearbeiten",
+"Add" => "Hinzufügen",
+"Security Warning" => "Sicherheitshinweis",
+"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 damit können Konten übernommen.",
+"Create an admin account" => "Administrator-Konto anlegen",
+"Advanced" => "Fortgeschritten",
+"Data folder" => "Datenverzeichnis",
+"Configure the database" => "Datenbank einrichten",
+"will be used" => "wird verwendet",
+"Database user" => "Datenbank-Benutzer",
+"Database password" => "Datenbank-Passwort",
+"Database name" => "Datenbank-Name",
+"Database tablespace" => "Datenbank-Tablespace",
+"Database host" => "Datenbank-Host",
+"Finish setup" => "Installation abschließen",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle",
+"Log out" => "Abmelden",
+"Lost your password?" => "Passwort vergessen?",
+"remember" => "merken",
+"Log in" => "Einloggen",
+"You are logged out." => "Du wurdest abgemeldet.",
+"prev" => "Zurück",
+"next" => "Weiter"
+);
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 0e0c43b899..f2b9a48fe1 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -69,6 +69,7 @@
"Cloud not found" => "Δεν βρέθηκε σύννεφο",
"Edit categories" => "Επεξεργασία κατηγορίας",
"Add" => "Προσθήκη",
+"Security Warning" => "Προειδοποίηση Ασφαλείας",
"Create an admin account" => "Δημιουργήστε έναν λογαριασμό διαχειριστή",
"Advanced" => "Για προχωρημένους",
"Data folder" => "Φάκελος δεδομένων",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 9e03abfdc2..a8f5b38a30 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -15,13 +15,40 @@
"October" => "Oktobro",
"November" => "Novembro",
"December" => "Decembro",
+"Choose" => "Elekti",
"Cancel" => "Nuligi",
"No" => "Ne",
"Yes" => "Jes",
"Ok" => "Akcepti",
"No categories selected for deletion." => "Neniu kategorio elektiĝis por forigo.",
"Error" => "Eraro",
+"Error while sharing" => "Eraro dum kunhavigo",
+"Error while unsharing" => "Eraro dum malkunhavigo",
+"Error while changing permissions" => "Eraro dum ŝanĝo de permesoj",
+"Shared with you and the group" => "Kunhavigita kun vi kaj la grupo",
+"by" => "de",
+"Shared with you by" => "Kunhavigita kun vi de",
+"Share with" => "Kunhavigi kun",
+"Share with link" => "Kunhavigi per ligilo",
+"Password protect" => "Protekti per pasvorto",
"Password" => "Pasvorto",
+"Set expiration date" => "Agordi limdaton",
+"Expiration date" => "Limdato",
+"Share via email:" => "Kunhavigi per retpoŝto:",
+"No people found" => "Ne troviĝis gento",
+"Resharing is not allowed" => "Rekunhavigo ne permesatas",
+"Shared in" => "Kunhavigita en",
+"with" => "kun",
+"Unshare" => "Malkunhavigi",
+"can edit" => "povas redakti",
+"access control" => "alirkontrolo",
+"create" => "krei",
+"update" => "ĝisdatigi",
+"delete" => "forigi",
+"share" => "kunhavigi",
+"Password protected" => "Protektita per pasvorto",
+"Error unsetting expiration date" => "Eraro dum malagordado de limdato",
+"Error setting expiration date" => "Eraro dum agordado de limdato",
"ownCloud password reset" => "La pasvorto de ownCloud restariĝis.",
"Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 204760720a..6c92947745 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -29,7 +29,7 @@
"by" => "por",
"Shared with you by" => "Compartido contigo por",
"Share with" => "Compartir con",
-"Share with link" => "Enlace de compartir con ",
+"Share with link" => "Compartir con enlace",
"Password protect" => "Protegido por contraseña",
"Password" => "Contraseña",
"Set expiration date" => "Establecer fecha de caducidad",
@@ -69,6 +69,10 @@
"Cloud not found" => "No se ha encontrado la nube",
"Edit categories" => "Editar categorías",
"Add" => "Añadir",
+"Security Warning" => "Advertencia de seguridad",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No está disponible un generador de números aleatorios seguro, por favor habilite la extensión OpenSSL de PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de su contraseña y tomar control de su cuenta.",
+"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." => "Su directorio de datos y sus archivos están probablemente accesibles desde internet. El archivo .htaccess que ownCloud provee no está funcionando. Sugerimos fuertemente que configure su servidor web de manera que el directorio de datos ya no esté accesible o mueva el directorio de datos fuera del documento raíz de su servidor web.",
"Create an admin account" => "Crea una cuenta de administrador",
"Advanced" => "Avanzado",
"Data folder" => "Directorio de almacenamiento",
@@ -82,10 +86,16 @@
"Finish setup" => "Completar la instalación",
"web services under your control" => "servicios web bajo tu control",
"Log out" => "Salir",
+"Automatic logon rejected!" => "¡Inicio de sesión automático rechazado!",
+"If you did not change your password recently, your account may be compromised!" => "Si usted no ha cambiado su contraseña recientemente, ¡puede que su cuenta esté comprometida!",
+"Please change your password to secure your account again." => "Por favor cambie su contraseña para asegurar su cuenta nuevamente.",
"Lost your password?" => "¿Has perdido tu contraseña?",
"remember" => "recuérdame",
"Log in" => "Entrar",
"You are logged out." => "Has cerrado la sesión.",
"prev" => "anterior",
-"next" => "siguiente"
+"next" => "siguiente",
+"Security Warning!" => "¡Advertencia de seguridad!",
+"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique su contraseña.
Por razones de seguridad se le puede volver a preguntar ocasionalmente la contraseña.",
+"Verify" => "Verificar"
);
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 7cea266d14..ecb909e2ed 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -69,6 +69,10 @@
"Cloud not found" => "No se encontró owncloud",
"Edit categories" => "Editar categorías",
"Add" => "Añadir",
+"Security Warning" => "Advertencia de seguridad",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "No hay disponible ningún generador de números aleatorios seguro. Por favor habilitá la extensión OpenSSL de PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sin un generador de números aleatorios seguro un atacante podría predecir los tokens de reinicio de tu contraseña y tomar control de tu cuenta.",
+"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." => "Tu directorio de datos y tus archivos son probablemente accesibles desde internet. El archivo .htaccess provisto por ownCloud no está funcionando. Te sugerimos que configures tu servidor web de manera que el directorio de datos ya no esté accesible, o que muevas el directorio de datos afuera del directorio raíz de tu servidor web.",
"Create an admin account" => "Creá una cuenta de administrador",
"Advanced" => "Avanzado",
"Data folder" => "Directorio de almacenamiento",
@@ -82,10 +86,16 @@
"Finish setup" => "Completar la instalación",
"web services under your control" => "servicios web sobre los que tenés control",
"Log out" => "Cerrar la sesión",
+"Automatic logon rejected!" => "¡El inicio de sesión automático fue rechazado!",
+"If you did not change your password recently, your account may be compromised!" => "¡Si no cambiaste tu contraseña recientemente, puede ser que tu cuenta esté comprometida!",
+"Please change your password to secure your account again." => "Por favor, cambiá tu contraseña para fortalecer nuevamente la seguridad de tu cuenta.",
"Lost your password?" => "¿Perdiste tu contraseña?",
"remember" => "recordame",
"Log in" => "Entrar",
"You are logged out." => "Terminaste la sesión.",
"prev" => "anterior",
-"next" => "siguiente"
+"next" => "siguiente",
+"Security Warning!" => "¡Advertencia de seguridad!",
+"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Por favor, verificá tu contraseña.
Por razones de seguridad, puede ser que que te pregunte ocasionalmente la contraseña.",
+"Verify" => "Verificar"
);
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 4ab46a8a33..0bdc3a33bd 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -69,6 +69,10 @@
"Cloud not found" => "Introuvable",
"Edit categories" => "Modifier les catégories",
"Add" => "Ajouter",
+"Security Warning" => "Avertissement de sécutité",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Aucun générateur de nombre aléatoire sécurisé n'est disponible, veuillez activer l'extension PHP OpenSSL",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sans générateur de nombre aléatoire sécurisé, un attaquant peut être en mesure de prédire les jetons de réinitialisation du mot de passe, et ainsi prendre le contrôle de votre compte utilisateur.",
+"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." => "Votre dossier data et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni par ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de manière à ce que le dossier data ne soit plus accessible ou bien de déplacer le dossier data en dehors du dossier racine des documents du serveur web.",
"Create an admin account" => "Créer un compte administrateur",
"Advanced" => "Avancé",
"Data folder" => "Répertoire des données",
@@ -82,10 +86,16 @@
"Finish setup" => "Terminer l'installation",
"web services under your control" => "services web sous votre contrôle",
"Log out" => "Se déconnecter",
+"Automatic logon rejected!" => "Connexion automatique rejetée !",
+"If you did not change your password recently, your account may be compromised!" => "Si vous n'avez pas changé votre mot de passe récemment, votre compte risque d'être compromis !",
+"Please change your password to secure your account again." => "Veuillez changer votre mot de passe pour sécuriser à nouveau votre compte.",
"Lost your password?" => "Mot de passe perdu ?",
"remember" => "se souvenir de moi",
"Log in" => "Connexion",
"You are logged out." => "Vous êtes désormais déconnecté.",
"prev" => "précédent",
-"next" => "suivant"
+"next" => "suivant",
+"Security Warning!" => "Alerte de sécurité !",
+"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Veuillez vérifier votre mot de passe.
Par sécurité il vous sera occasionnellement demandé d'entrer votre mot de passe de nouveau.",
+"Verify" => "Vérification"
);
diff --git a/core/l10n/it.php b/core/l10n/it.php
index c586171275..950517f9d0 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -69,6 +69,10 @@
"Cloud not found" => "Nuvola non trovata",
"Edit categories" => "Modifica le categorie",
"Add" => "Aggiungi",
+"Security Warning" => "Avviso di sicurezza",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Non è disponibile alcun generatore di numeri casuali sicuro. Abilita l'estensione OpenSSL di PHP",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Senza un generatore di numeri casuali sicuro, un malintenzionato potrebbe riuscire a individuare i token di ripristino delle password e impossessarsi del tuo 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." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet. Il file .htaccess fornito da ownCloud non funziona. Ti suggeriamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o sposta tale cartella fuori dalla radice del sito.",
"Create an admin account" => "Crea un account amministratore",
"Advanced" => "Avanzate",
"Data folder" => "Cartella dati",
@@ -82,10 +86,16 @@
"Finish setup" => "Termina la configurazione",
"web services under your control" => "servizi web nelle tue mani",
"Log out" => "Esci",
+"Automatic logon rejected!" => "Accesso automatico rifiutato.",
+"If you did not change your password recently, your account may be compromised!" => "Se non hai cambiato la password recentemente, il tuo account potrebbe essere stato compromesso.",
+"Please change your password to secure your account again." => "Cambia la password per rendere nuovamente sicuro il tuo account.",
"Lost your password?" => "Hai perso la password?",
"remember" => "ricorda",
"Log in" => "Accedi",
"You are logged out." => "Sei uscito.",
"prev" => "precedente",
-"next" => "successivo"
+"next" => "successivo",
+"Security Warning!" => "Avviso di sicurezza",
+"Please verify your password.
For security reasons you may be occasionally asked to enter your password again." => "Verifica la tua password.
Per motivi di sicurezza, potresti ricevere una richiesta di digitare nuovamente la password.",
+"Verify" => "Verifica"
);
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 94e1d4dd4f..cb3f02a2ef 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -69,6 +69,10 @@
"Cloud not found" => "見つかりません",
"Edit categories" => "カテゴリを編集",
"Add" => "追加",
+"Security Warning" => "セキュリティ警告",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "セキュアな乱数生成器が利用可能ではありません。PHPのOpenSSL拡張を有効にして下さい。",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your 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." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。 ",
"Create an admin account" => "管理者アカウントを作成してください",
"Advanced" => "詳細設定",
"Data folder" => "データフォルダ",
@@ -82,10 +86,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.
For security reasons you may be occasionally asked to enter your password again." => "パスワードの確認をお願いします。
セキュリティ上の理由により、時々パスワードの再入力をお願いする場合があります。",
+"Verify" => "確認"
);
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index c332585325..54a442bc2f 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -69,6 +69,9 @@
"Cloud not found" => "Cloud não encontrado",
"Edit categories" => "Editar categorias",
"Add" => "Adicionar",
+"Security Warning" => "Aviso de Segurança",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Nenhum gerador de número aleatório de segurança disponível. Habilite a extensão OpenSSL do PHP.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Sem um gerador de número aleatório de segurança, um invasor pode ser capaz de prever os símbolos de redefinição de senhas e assumir sua conta.",
"Create an admin account" => "Criar uma conta de administrador",
"Advanced" => "Avançado",
"Data folder" => "Pasta de dados",
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 60e15b996e..d658ecb18e 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -30,6 +30,7 @@
"Password" => "Пароль",
"Set expiration date" => "Установить срок действия",
"Expiration date" => "Дата истечения срока действия",
+"Share via email:" => "Сделать общедоступным посредством email:",
"No people found" => "Не найдено людей",
"Resharing is not allowed" => "Рекурсивный общий доступ не разрешен",
"with" => "с",
@@ -41,6 +42,8 @@
"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." => "Вы получите ссылку для восстановления пароля по электронной почте.",
@@ -61,6 +64,8 @@
"Cloud not found" => "Облако не найдено",
"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." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
"Create an admin account" => "Создать admin account",
"Advanced" => "Расширенный",
"Data folder" => "Папка данных",
@@ -74,10 +79,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.
For security reasons you may be occasionally asked to enter your password again." => "Пожалуйста, проверьте свой пароль.
По соображениям безопасности Вам может быть иногда предложено ввести пароль еще раз.",
+"Verify" => "Проверить"
);
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
new file mode 100644
index 0000000000..bfccbfd3e8
--- /dev/null
+++ b/core/l10n/si_LK.php
@@ -0,0 +1,29 @@
+ "යෙදුම් නාමය සපයා නැත.",
+"Settings" => "සැකසුම්",
+"January" => "ජනවාරි",
+"February" => "පෙබරවාරි",
+"March" => "මාර්තු",
+"April" => "අප්රේල්",
+"May" => "මැයි",
+"June" => "ජූනි",
+"July" => "ජූලි",
+"August" => "අගෝස්තු",
+"September" => "සැප්තැම්බර්",
+"October" => "ඔක්තෝබර්",
+"November" => "නොවැම්බර්",
+"December" => "දෙසැම්බර්",
+"Choose" => "තෝරන්න",
+"Cancel" => "එපා",
+"No" => "නැහැ",
+"Yes" => "ඔව්",
+"Ok" => "හරි",
+"Password" => "මුර පදය ",
+"To login page" => "පිවිසුම් පිටුවට",
+"New password" => "නව මුර පදයක්",
+"Apps" => "යෙදුම්",
+"Help" => "උදව්",
+"Add" => "එක් කරන්න",
+"Data folder" => "දත්ත ෆෝල්ඩරය",
+"next" => "ඊළඟ"
+);
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 20ad151778..935f9ab16f 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -38,6 +38,7 @@
"No people found" => "Užívateľ nenájdený",
"with" => "s",
"Unshare" => "Zrušiť zdieľanie",
+"can edit" => "môže upraviť",
"access control" => "riadenie prístupu",
"create" => "vytvoriť",
"delete" => "zmazať",
@@ -63,6 +64,7 @@
"Cloud not found" => "Nenájdené",
"Edit categories" => "Úprava kategórií",
"Add" => "Pridať",
+"Security Warning" => "Bezpečnostné varovanie",
"Create an admin account" => "Vytvoriť administrátorský účet",
"Advanced" => "Pokročilé",
"Data folder" => "Priečinok dát",
@@ -75,10 +77,13 @@
"Finish setup" => "Dokončiť inštaláciu",
"web services under your control" => "webové služby pod vašou kontrolou",
"Log out" => "Odhlásiť",
+"Automatic logon rejected!" => "Automatické prihlásenie bolo zamietnuté!",
"Lost your password?" => "Zabudli ste heslo?",
"remember" => "zapamätať",
"Log in" => "Prihlásiť sa",
"You are logged out." => "Ste odhlásený.",
"prev" => "späť",
-"next" => "ďalej"
+"next" => "ďalej",
+"Security Warning!" => "Bezpečnostné varovanie!",
+"Verify" => "Overenie"
);
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 90e416fc73..2833792e0b 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -69,6 +69,9 @@
"Cloud not found" => "Hittade inget moln",
"Edit categories" => "Redigera kategorier",
"Add" => "Lägg till",
+"Security Warning" => "Säkerhetsvarning",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ingen säker slumptalsgenerator finns tillgänglig. Du bör aktivera PHP OpenSSL-tillägget.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Utan en säker slumptalsgenerator kan angripare få möjlighet att förutsäga lösenordsåterställningar och ta över ditt konto.",
"Create an admin account" => "Skapa ett administratörskonto",
"Advanced" => "Avancerat",
"Data folder" => "Datamapp",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 26155a1866..758bd7274f 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -15,13 +15,36 @@
"October" => "Tháng 10",
"November" => "Tháng 11",
"December" => "Tháng 12",
+"Choose" => "Chọn",
"Cancel" => "Hủy",
"No" => "No",
"Yes" => "Yes",
"Ok" => "Ok",
"No categories selected for deletion." => "Không có thể loại nào được chọn để xóa.",
"Error" => "Lỗi",
+"Error while sharing" => "Lỗi trong quá trình chia sẻ",
+"Error while unsharing" => "Lỗi trong quá trình gỡ chia sẻ",
+"Error while changing permissions" => "Lỗi trong quá trình phân quyền",
+"Shared with you and the group" => "Được chia sẻ với bạn và Nhóm",
+"Shared with you by" => "Được chia sẻ với bạn qua",
+"Share with" => "Chia sẻ với",
+"Share with link" => "Chia sẻ với link",
"Password" => "Mật khẩu",
+"Set expiration date" => "Đặt ngày kết thúc",
+"Expiration date" => "Ngày kết thúc",
+"Share via email:" => "Chia sẻ thông qua email",
+"No people found" => "Không tìm thấy người nào",
+"Shared in" => "Chi sẻ trong",
+"with" => "với",
+"Unshare" => "Gỡ bỏ chia sẻ",
+"access control" => "quản lý truy cập",
+"create" => "tạo",
+"update" => "cập nhật",
+"delete" => "xóa",
+"share" => "chia sẻ",
+"Password protected" => "Mật khẩu bảo vệ",
+"Error unsetting expiration date" => "Lỗi trong quá trình gỡ bỏ ngày kết thúc",
+"Error setting expiration date" => "Lỗi cấu hình ngày kết thúc",
"ownCloud password reset" => "Khôi phục mật khẩu Owncloud ",
"Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
"You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 2f87278bf5..a69bbec0b2 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -69,6 +69,10 @@
"Cloud not found" => "云 没有被找到",
"Edit categories" => "编辑分类",
"Add" => "添加",
+"Security Warning" => "安全警告",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "没有安全随机码生成器,请启用 PHP OpenSSL 扩展。",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your 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." => "您的数据文件夹和您的文件或许能够从互联网访问。ownCloud 提供的 .htaccesss 文件未其作用。我们强烈建议您配置网络服务器以使数据文件夹不能从互联网访问,或将移动数据文件夹移出网络服务器文档根目录。",
"Create an admin account" => "建立一个 管理帐户",
"Advanced" => "进阶",
"Data folder" => "数据存放文件夹",
@@ -82,10 +86,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.
For security reasons you may be occasionally asked to enter your password again." => "请确认您的密码。
处于安全原因你偶尔也会被要求再次输入您的密码。",
+"Verify" => "确认"
);
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 4cd8b9079f..906208dcbc 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -13,8 +13,8 @@ require_once '../../lib/base.php';
// Someone lost their password:
if (isset($_POST['user'])) {
if (OC_User::userExists($_POST['user'])) {
- $token = hash("sha256", $_POST['user'].OC_Util::generate_random_bytes(10));
- OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', $token);
+ $token = hash("sha256", OC_Util::generate_random_bytes(30).OC_Config::getValue('passwordsalt', ''));
+ OC_Preferences::setValue($_POST['user'], 'owncloud', 'lostpassword', hash("sha256", $token)); // Hash the token again to prevent timing attacks
$email = OC_Preferences::getValue($_POST['user'], 'settings', 'email', '');
if (!empty($email)) {
$link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php', array('user' => $_POST['user'], 'token' => $token));
diff --git a/core/lostpassword/resetpassword.php b/core/lostpassword/resetpassword.php
index 28a0063fc6..896c8da76e 100644
--- a/core/lostpassword/resetpassword.php
+++ b/core/lostpassword/resetpassword.php
@@ -10,7 +10,7 @@ $RUNTIME_NOAPPS = TRUE; //no apps
require_once '../../lib/base.php';
// Someone wants to reset their password:
-if(isset($_GET['token']) && isset($_GET['user']) && OC_Preferences::getValue($_GET['user'], 'owncloud', 'lostpassword') === $_GET['token']) {
+if(isset($_GET['token']) && isset($_GET['user']) && OC_Preferences::getValue($_GET['user'], 'owncloud', 'lostpassword') === hash("sha256", $_GET['token'])) {
if (isset($_POST['password'])) {
if (OC_User::setPassword($_GET['user'], $_POST['password'])) {
OC_Preferences::deleteKey($_GET['user'], 'owncloud', 'lostpassword');
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 1a05c3fb76..c0b29ea909 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -3,7 +3,6 @@
'>
'>