aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-11-23 00:40:58 +0100
committerRobin Appelman <icewind@owncloud.com>2012-11-23 00:40:58 +0100
commit95057e727d438098bec050baf997a7489563a04e (patch)
tree9c3dd5dfc543d7726c8f68b4cf041ad24c7fe7b8 /apps/files
parent8fb4dfd2eabcc267725d3c151d93644d6f28f010 (diff)
parent3688376a6f0d2e1ba0a98345aba0d7b82940db4a (diff)
downloadnextcloud-server-95057e727d438098bec050baf997a7489563a04e.tar.gz
nextcloud-server-95057e727d438098bec050baf997a7489563a04e.zip
merge master into filesystem
Diffstat (limited to 'apps/files')
-rw-r--r--apps/files/js/files.js4
-rw-r--r--apps/files/l10n/ja_JP.php2
-rw-r--r--apps/files/l10n/lv.php9
-rw-r--r--apps/files/l10n/th_TH.php1
4 files changed, 15 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index f95bfa2bf8f..4307650d4ff 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -509,6 +509,10 @@ $(document).ready(function() {
$('#notification').text(t('files','Invalid name, \'/\' is not allowed.'));
$('#notification').fadeIn();
return;
+ } else if( type == 'folder' && $('#dir').val() == '/' && $(this).val() == 'Shared') {
+ $('#notification').text(t('files','Invalid folder name. Usage of "Shared" is reserved by Owncloud'));
+ $('#notification').fadeIn();
+ return;
}
var name = getUniqueName($(this).val());
if (name != $(this).val()) {
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index b97975b8ef7..c4c78545a79 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -20,7 +20,7 @@
"unshared {files}" => "未共有 {files}",
"deleted {files}" => "削除 {files}",
"generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
-"Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。",
+"Unable to upload your file as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのファイルはアップロードできません",
"Upload Error" => "アップロードエラー",
"Close" => "閉じる",
"Pending" => "保留",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 6488ee534ec..24b46f53316 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -1,10 +1,14 @@
<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Viss kārtībā, augšupielāde veiksmīga",
"No file was uploaded" => "Neviens fails netika augšuplādēts",
+"Missing a temporary folder" => "Trūkst pagaidu mapes",
"Failed to write to disk" => "Nav iespējams saglabāt",
"Files" => "Faili",
"Unshare" => "Pārtraukt līdzdalīšanu",
"Delete" => "Izdzēst",
+"Rename" => "Pārdēvēt",
"replace" => "aizvietot",
+"suggest name" => "Ieteiktais nosaukums",
"cancel" => "atcelt",
"undo" => "vienu soli atpakaļ",
"generating ZIP-file, it may take some time." => "lai uzģenerētu ZIP failu, kāds brīdis ir jāpagaida",
@@ -12,14 +16,18 @@
"Upload Error" => "Augšuplādēšanas laikā radās kļūda",
"Pending" => "Gaida savu kārtu",
"Upload cancelled." => "Augšuplāde ir atcelta",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Notiek augšupielāde. Pametot lapu tagad, tiks atcelta augšupielāde.",
"Invalid name, '/' is not allowed." => "Šis simbols '/', nav atļauts.",
"Name" => "Nosaukums",
"Size" => "Izmērs",
"Modified" => "Izmainīts",
+"File handling" => "Failu pārvaldība",
"Maximum upload size" => "Maksimālais failu augšuplādes apjoms",
"max. possible: " => "maksīmālais iespējamais:",
+"Needed for multi-file and folder downloads." => "Vajadzīgs vairāku failu un mapju lejuplādei",
"Enable ZIP-download" => "Iespējot ZIP lejuplādi",
"0 is unlimited" => "0 ir neierobežots",
+"Save" => "Saglabāt",
"New" => "Jauns",
"Text file" => "Teksta fails",
"Folder" => "Mape",
@@ -29,6 +37,7 @@
"Share" => "Līdzdalīt",
"Download" => "Lejuplādēt",
"Upload too large" => "Fails ir par lielu lai to augšuplādetu",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Jūsu augšuplādējamie faili pārsniedz servera pieļaujamo failu augšupielādes apjomu",
"Files are being scanned, please wait." => "Faili šobrīd tiek caurskatīti, nedaudz jāpagaida.",
"Current scanning" => "Šobrīd tiek pārbaudīti"
);
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 79b607413f0..3352dc13110 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -49,6 +49,7 @@
"New" => "อัพโหลดไฟล์ใหม่",
"Text file" => "ไฟล์ข้อความ",
"Folder" => "แฟ้มเอกสาร",
+"From link" => "จากลิงก์",
"Upload" => "อัพโหลด",
"Cancel upload" => "ยกเลิกการอัพโหลด",
"Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",