diff options
84 files changed, 1404 insertions, 1177 deletions
diff --git a/apps/files/css/files.css b/apps/files/css/files.css index f35478ecc21..566ae39f92c 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -12,14 +12,15 @@ .file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; } .file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:0;} .file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; } -#new { float:left; border-top-right-radius:0; border-bottom-right-radius:0; margin:0 0 0 1em; border-right:none; z-index:1010; height:1.3em; } +#new { background-color:#5bb75b; float:left; border-top-right-radius:0; border-bottom-right-radius:0; margin:0 0 0 1em; border-right:none; z-index:1010; height:1.3em; } +#new:hover, a.file_upload_button_wrapper:hover + button.file_upload_filename { background-color:#4b964b; } #new.active { border-bottom-left-radius:0; border-bottom:none; } #new>a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; } #new>ul { display:none; position:fixed; text-align:left; padding:.5em; background:#f8f8f8; margin-top:0.075em; border:1px solid #ddd; min-width:7em; margin-left:-.5em; z-index:-1; } #new>ul>li { margin:.3em; padding-left:2em; background-repeat:no-repeat; cursor:pointer; padding-bottom:0.1em } #new>ul>li>p { cursor:pointer; } #new>ul>li>input { padding:0.3em; margin:-0.3em; } -#new, .file_upload_filename { background:#5bb75b; border:1px solid; border-color:#51a351 #419341 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; } +#new, .file_upload_filename { border:1px solid; border-color:#51a351 #419341 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; } #new .popup { border-top-left-radius:0; } #file_newfolder_name { background-image:url('%webroot%/core/img/places/folder.svg'); font-weight:normal; width:7em; } @@ -29,8 +30,7 @@ .file_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;} .file_upload_filename.active { border-bottom-right-radius:0 } -.file_upload_filename { z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; } -.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; } +.file_upload_filename { background-color:#5bb75b; z-index:100; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; background-image: url('%webroot%/core/img/actions/upload-white.svg'); background-repeat: no-repeat; background-position: center; height: 2.29em; width: 2.5em; } #upload { position:absolute; right:13.5em; top:0em; } #upload #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; } @@ -87,3 +87,6 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; } #navigation>ul>li:first-child+li { padding-top:2.9em; } #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/fileactions.js b/apps/files/js/fileactions.js index 1403d345e8a..f579d8530ed 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -179,6 +179,7 @@ FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC. $('.tipsy').remove(); }); +// t('files', 'Rename') FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename');},function(filename){ FileList.rename(filename); }); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 383ade997c5..261d0d76890 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -145,31 +145,33 @@ 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'); newname = name; } + tr.data('renaming',false); }); + + } + + tr.attr('data-file', newname); + var path = td.children('a.name').attr('href'); + td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname))); + if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') { + var basename=newname.substr(0,newname.lastIndexOf('.')); + } else { + var basename=newname; + } + td.children('a.name').empty(); + var span=$('<span class="nametext"></span>'); + span.text(basename); + td.children('a.name').append(span); + if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') { + span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>')); } } - tr.attr('data-file', newname); - var path = td.children('a.name').attr('href'); - td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname))); - if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') { - var basename=newname.substr(0,newname.lastIndexOf('.')); - } else { - var basename=newname; - } - td.children('a.name').empty(); - var span=$('<span class="nametext"></span>'); - span.text(basename); - td.children('a.name').append(span); - if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') { - span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>')); - } - tr.data('renaming',false); return false; }); input.click(function(event){ @@ -255,20 +257,23 @@ var FileList={ }, do_delete:function(files){ // Finish any existing actions - if (FileList.lastAction || !FileList.useUndo) { - if(!FileList.deleteFiles) { - FileList.prepareDeletion(files); - } + if (FileList.lastAction) { FileList.lastAction(); } + FileList.prepareDeletion(files); - // NOTE: Temporary fix to change the text to unshared for files in root of Shared folder - if ($('#dir').val() == '/Shared') { - $('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>'); + + if (!FileList.useUndo) { + FileList.lastAction(); } else { - $('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>'); + // NOTE: Temporary fix to change the text to unshared for files in root of Shared folder + if ($('#dir').val() == '/Shared') { + $('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>'); + } else { + $('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>'); + } + $('#notification').fadeIn(); } - $('#notification').fadeIn(); }, finishDelete:function(ready,sync){ if(!FileList.deleteCanceled && FileList.deleteFiles){ diff --git a/apps/files/js/files.js b/apps/files/js/files.js index aefd6f20bec..ec2f159b4ca 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -356,12 +356,13 @@ $(document).ready(function() { $('#notification').fadeIn(); } }); - uploadingFiles[files[i].name] = jqXHR; + uploadingFiles[uniqueName] = jqXHR; } } }else{ data.submit().success(function(data, status) { - response = jQuery.parseJSON(data[0].body.innerText); + // in safari data is a string + response = jQuery.parseJSON(typeof data === 'string' ? data : data[0].body.innerText); if(response[0] != undefined && response[0].status == 'success') { var file=response[0]; delete uploadingFiles[file.name]; diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php index 5b9f11814cf..404b580ca16 100644 --- a/apps/files/l10n/el.php +++ b/apps/files/l10n/el.php @@ -3,9 +3,9 @@ "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Το αρχείο που μεταφορτώθηκε υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini", "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα", "The uploaded file was only partially uploaded" => "Το αρχείο μεταφορώθηκε μόνο εν μέρει", -"No file was uploaded" => "Το αρχείο δεν μεταφορτώθηκε", -"Missing a temporary folder" => "Λείπει ένας προσωρινός φάκελος", -"Failed to write to disk" => "Η εγγραφή στο δίσκο απέτυχε", +"No file was uploaded" => "Κανένα αρχείο δεν μεταφορτώθηκε", +"Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος", +"Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο", "Files" => "Αρχεία", "Unshare" => "Διακοπή κοινής χρήσης", "Delete" => "Διαγραφή", @@ -16,15 +16,17 @@ "replaced" => "αντικαταστάθηκε", "undo" => "αναίρεση", "with" => "με", -"unshared" => "Διακόπηκε η κοινή χρήση", +"unshared" => "Διακόπηκε ο διαμοιρασμός", "deleted" => "διαγράφηκε", "generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.", "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes", "Upload Error" => "Σφάλμα Μεταφόρτωσης", -"Pending" => "Εν αναμονή", +"Pending" => "Εκκρεμεί", "Upload cancelled." => "Η μεταφόρτωση ακυρώθηκε.", "File upload is in progress. Leaving the page now will cancel the upload." => "Η μεταφόρτωση του αρχείου βρίσκεται σε εξέλιξη. Έξοδος από την σελίδα τώρα θα ακυρώσει την μεταφόρτωση.", "Invalid name, '/' is not allowed." => "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται.", +"files scanned" => "αρχεία σαρώθηκαν", +"error while scanning" => "σφάλμα κατά την ανίχνευση", "Size" => "Μέγεθος", "Modified" => "Τροποποιήθηκε", "folder" => "φάκελος", @@ -44,13 +46,13 @@ "Folder" => "Φάκελος", "From url" => "Από την διεύθυνση", "Upload" => "Μεταφόρτωση", -"Cancel upload" => "Ακύρωση ανεβάσματος", +"Cancel upload" => "Ακύρωση μεταφόρτωσης", "Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!", "Name" => "Όνομα", -"Share" => "Διαμοίρασε", +"Share" => "Διαμοιρασμός", "Download" => "Λήψη", -"Upload too large" => "Πολύ μεγάλο το αρχείο προς μεταφόρτωση", -"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή.", -"Files are being scanned, please wait." => "Τα αρχεία ανιχνεύονται, παρακαλώ περιμένετε", +"Upload too large" => "Πολύ μεγάλο αρχείο προς μεταφόρτωση", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να μεταφορτώσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή.", +"Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε", "Current scanning" => "Τρέχουσα αναζήτηση " ); diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index d72e73adf00..fd8ec94895e 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -25,6 +25,8 @@ "Upload cancelled." => "Igoera ezeztatuta", "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.", "Invalid name, '/' is not allowed." => "Baliogabeko izena, '/' ezin da erabili. ", +"files scanned" => "fitxategiak eskaneatuta", +"error while scanning" => "errore bat egon da eskaneatzen zen bitartean", "Size" => "Tamaina", "Modified" => "Aldatuta", "folder" => "karpeta", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 6d278c3f0fb..84d671a938d 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -25,6 +25,8 @@ "Upload cancelled." => "アップロードはキャンセルされました。", "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。", "Invalid name, '/' is not allowed." => "無効な名前、'/' は使用できません。", +"files scanned" => "ファイルをスキャンしました", +"error while scanning" => "スキャン中のエラー", "Size" => "サイズ", "Modified" => "更新日時", "folder" => "フォルダ", diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 911a312fb9a..aff484f0a7a 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -16,9 +16,9 @@ <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload"> <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)"> <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir"> - <button class="file_upload_filename"> <img class='svg action' alt="Upload" src="<?php echo OCP\image_path("core", "actions/upload-white.svg"); ?>" /></button> <input class="file_upload_start" type="file" name='files[]'/> - <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a> + <a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a> + <button class="file_upload_filename"></button> <iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe> </form> </div> diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php new file mode 100644 index 00000000000..1328b0d0359 --- /dev/null +++ b/apps/files_encryption/l10n/ru_RU.php @@ -0,0 +1,6 @@ +<?php $TRANSLATIONS = array( +"Encryption" => "Шифрование", +"Exclude the following file types from encryption" => "Исключите следующие типы файлов из шифрования", +"None" => "Ни один", +"Enable Encryption" => "Включить шифрование" +); diff --git a/apps/files_external/l10n/ru_RU.php b/apps/files_external/l10n/ru_RU.php new file mode 100644 index 00000000000..5b0cf1b6aaa --- /dev/null +++ b/apps/files_external/l10n/ru_RU.php @@ -0,0 +1,18 @@ +<?php $TRANSLATIONS = array( +"External Storage" => "Внешние системы хранения данных", +"Mount point" => "Точка монтирования", +"Backend" => "Бэкэнд", +"Configuration" => "Конфигурация", +"Options" => "Опции", +"Applicable" => "Применимый", +"Add mount point" => "Добавить точку монтирования", +"None set" => "Не задан", +"All Users" => "Все пользователи", +"Groups" => "Группы", +"Users" => "Пользователи", +"Delete" => "Удалить", +"SSL root certificates" => "Корневые сертификаты SSL", +"Import Root Certificate" => "Импортировать корневые сертификаты", +"Enable User External Storage" => "Включить пользовательскую внешнюю систему хранения данных", +"Allow users to mount their own external storage" => "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных" +); diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index eec31ec2ef9..f87a042b386 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -270,6 +270,7 @@ class OC_Mount_Config { fclose($fh); if (strpos($data, 'BEGIN CERTIFICATE')) { fwrite($fh_certs, $data); + fwrite($fh_certs, "\r\n"); } } diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index eabd1167c97..5ef7a8bbb9c 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -1,6 +1,7 @@ <?php $installedVersion = OCP\Config::getAppValue('files_sharing', 'installed_version'); if (version_compare($installedVersion, '0.3', '<')) { + $update_error = false; $query = OCP\DB::prepare('SELECT * FROM `*PREFIX*sharing`'); $result = $query->execute(); $groupShares = array(); @@ -38,10 +39,19 @@ if (version_compare($installedVersion, '0.3', '<')) { $shareWith = $row['uid_shared_with']; } OC_User::setUserId($row['uid_owner']); - OCP\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions); + try { + OCP\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions); + } + catch (Exception $e) { + $update_error = true; + echo 'Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")<br/>'; + } } } + if ($update_error) { + throw new Exception('There were some problems upgrading the sharing of files'); + } // NOTE: Let's drop the table after more testing // $query = OCP\DB::prepare('DROP TABLE `*PREFIX*sharing`'); // $query->execute(); -}
\ No newline at end of file +} diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css index a700cc2169b..fb4794e0474 100644 --- a/apps/files_sharing/css/public.css +++ b/apps/files_sharing/css/public.css @@ -1,8 +1,11 @@ body { background:#ddd; } #header { position:fixed; top:0; left:0; right:0; z-index:100; height:2.5em; line-height:2.5em; padding:.5em; background:#1d2d44; -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; } #details { color:#fff; } -#header #download { margin-left:2em; font-weight:bold; color:#fff; } +#header #download { margin-left:2em; font-weight:bold; } +#header #download img { padding-left: 0.1em; padding-right: 0.3em; vertical-align: text-bottom; } #preview { min-height:30em; margin:50px auto; padding-top:2em; border-bottom:1px solid #f8f8f8; background:#eee; text-align:center; } #noPreview { display:none; padding-top:5em; } p.info { width:22em; text-align: center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; } -p.info a { font-weight:bold; color:#777; }
\ No newline at end of file +p.info a { font-weight:bold; color:#777; } +#imgframe { width:80%; height: 75%; margin: 0 auto; padding-bottom:2em; } +#imgframe img { max-height:100%; max-width: 100%; }
\ No newline at end of file diff --git a/apps/files_sharing/l10n/ru_RU.php b/apps/files_sharing/l10n/ru_RU.php new file mode 100644 index 00000000000..a1579efc8f9 --- /dev/null +++ b/apps/files_sharing/l10n/ru_RU.php @@ -0,0 +1,7 @@ +<?php $TRANSLATIONS = array( +"Password" => "Пароль", +"Submit" => "Передать", +"Download" => "Загрузка", +"No preview available for" => "Предварительный просмотр недоступен", +"web services under your control" => "веб-сервисы под Вашим контролем" +); diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index 2149da1d731..074ca9928d4 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -47,7 +47,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { } public function generateTarget($filePath, $shareWith, $exclude = null) { - $target = $filePath; + $target = '/'.basename($filePath); if (isset($exclude)) { if ($pos = strrpos($target, '.')) { $name = substr($target, 0, $pos); @@ -72,8 +72,16 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { // Only 1 item should come through for this format call return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions']); } else if ($format == self::FORMAT_FILE_APP) { + if (isset($parameters['mimetype_filter']) && $parameters['mimetype_filter']) { + $mimetype_filter = $parameters['mimetype_filter']; + } $files = array(); foreach ($items as $item) { + if (isset($mimetype_filter) + && strpos($item['mimetype'], $mimetype_filter) !== 0 + && $item['mimetype'] != 'httpd/unix-directory') { + continue; + } $file = array(); $file['id'] = $item['file_source']; $file['path'] = $item['file_target']; @@ -116,4 +124,4 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { return array(); } -}
\ No newline at end of file +} diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index bed1a19fd63..dbaf29e962d 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -119,7 +119,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { $folder->assign('uploadMaxHumanFilesize', 0); $folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); $tmpl->assign('folder', $folder->fetchPage(), false); - $tmpl->assign('details', $uidOwner.' shared the folder '.$baseDir.' with you'); + $tmpl->assign('uidOwner', $uidOwner); $tmpl->assign('dir', basename($dir)); $tmpl->assign('filename', basename($path)); $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path)); @@ -132,7 +132,7 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { $tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.$_GET['dir'].'&path='.$getPath, false); } else { // Show file preview if viewer is available - $tmpl->assign('details', $uidOwner.' shared the file '.basename($path).' with you'); + $tmpl->assign('uidOwner', $uidOwner); $tmpl->assign('dir', dirname($path)); $tmpl->assign('filename', basename($path)); $tmpl->assign('mimetype', OC_Filesystem::getMimeType($path)); @@ -155,4 +155,4 @@ if (isset($_GET['file']) || isset($_GET['dir'])) { } header('HTTP/1.0 404 Not Found'); $tmpl = new OCP\Template('', '404', 'guest'); -$tmpl->printPage();
\ No newline at end of file +$tmpl->printPage(); diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index 426b45b2681..fd9b79e6f17 100755..100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -5,9 +5,13 @@ <header><div id="header"> <a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a> <div class="header-right"> - <span id="details"><?php echo $_['details']; ?></span> + <?php if (isset($_['folder'])): ?> + <span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['uidOwner'], $_['filename'])) ?></span> + <?php else: ?> + <span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['uidOwner'], $_['filename'])) ?></span> + <?php endif; ?> <?php if (!isset($_['folder']) || $_['allowZipDownload']): ?> - <a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a> + <a href="<?php echo $_['downloadURL']; ?>" class="button" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a> <?php endif; ?> </div> </div></header> @@ -16,7 +20,9 @@ <?php echo $_['folder']; ?> <?php else: ?> <?php if (substr($_['mimetype'], 0 , strpos($_['mimetype'], '/')) == 'image'): ?> - <img src="<?php echo $_['downloadURL']; ?>" /> + <div id="imgframe"> + <img src="<?php echo $_['downloadURL']; ?>" /> + </div> <?php endif; ?> <ul id="noPreview"> <li class="error"> @@ -28,4 +34,4 @@ <div id="content"></div> <table></table> </div> -<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> – <?php echo $l->t('web services under your control'); ?></p></footer>
\ No newline at end of file +<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> – <?php echo $l->t('web services under your control'); ?></p></footer> diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index 495848b8226..9075095d286 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -10,10 +10,10 @@ $(document).ready(function() { $(document).ready(function(){ if (typeof FileActions !== 'undefined') { - // Add history button to files/index.php + // Add history button to 'files/index.php' FileActions.register( 'file' - ,'History' + , t('files_versions', 'History') , OC.PERMISSION_UPDATE , function() { // Specify icon for hitory button @@ -147,4 +147,4 @@ $(this).click( } -);
\ No newline at end of file +); diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php index 889e762c6b9..d4353c96cd6 100644 --- a/apps/files_versions/l10n/eu.php +++ b/apps/files_versions/l10n/eu.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( "Expire all versions" => "Iraungi bertsio guztiak", "Versions" => "Bertsioak", -"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu" +"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu", +"Files Versioning" => "Fitxategien Bertsioak", +"Enable" => "Gaitu" ); diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php index 7a00d0b4dad..8a4e0ab245d 100644 --- a/apps/files_versions/l10n/ja_JP.php +++ b/apps/files_versions/l10n/ja_JP.php @@ -1,5 +1,7 @@ <?php $TRANSLATIONS = array( "Expire all versions" => "すべてのバージョンを削除する", "Versions" => "バージョン", -"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します" +"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します", +"Files Versioning" => "ファイルのバージョン管理", +"Enable" => "有効化" ); diff --git a/apps/files_versions/l10n/ru_RU.php b/apps/files_versions/l10n/ru_RU.php new file mode 100644 index 00000000000..2563c318bc2 --- /dev/null +++ b/apps/files_versions/l10n/ru_RU.php @@ -0,0 +1,6 @@ +<?php $TRANSLATIONS = array( +"Versions" => "Версии", +"This will delete all existing backup versions of your files" => "Это приведет к удалению всех существующих версий резервной копии ваших файлов", +"Files Versioning" => "Файлы управления версиями", +"Enable" => "Включить" +); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index c517eb01ff5..7d12e58f941 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -35,46 +35,31 @@ class Storage { const DEFAULTMININTERVAL=60; // 1 min const DEFAULTMAXVERSIONS=50; - private $view; - - function __construct() { - - $this->view = \OCP\Files::getStorage('files_versions'); - - } - - /** - * listen to write event. - */ - public static function write_hook($params) { - if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - $path = $params[\OC_Filesystem::signal_param_path]; - if($path<>'') $this->store($path); + private static function getUidAndFilename($filename) + { + if (\OCP\App::isEnabled('files_sharing') + && substr($filename, 0, 7) == '/Shared' + && $source = \OCP\Share::getItemSharedWith('file', + substr($filename, 7), + \OC_Share_Backend_File::FORMAT_SHARED_STORAGE)) { + $filename = $source['path']; + $pos = strpos($filename, '/files', 1); + $uid = substr($filename, 1, $pos - 1); + $filename = substr($filename, $pos + 6); + } else { + $uid = \OCP\User::getUser(); } + return array($uid, $filename); } - - /** * store a new version of a file. */ public function store($filename) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - - $files_view = \OCP\Files::getStorage("files"); - $users_view = \OCP\Files::getStorage("files_versions"); - $users_view->chroot(\OCP\User::getUser().'/'); - - //FIXME OC_Share no longer exists - //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) { - // $pos = strpos($source, '/files', 1); - // $uid = substr($source, 1, $pos - 1); - // $filename = substr($source, $pos + 6); - //} else { - $uid = \OCP\User::getUser(); - //} - - $versionsFolderName=\OCP\Config::getSystemValue('datadirectory') . $this->view->getAbsolutePath(''); + list($uid, $filename) = self::getUidAndFilename($filename); + $files_view = new \OC_FilesystemView('/'.$uid.'/files'); + $users_view = new \OC_FilesystemView('/'.$uid); //check if source file already exist as version to avoid recursions. // todo does this check work? @@ -96,7 +81,6 @@ class Storage { return false; } } - // we should have a source file to work with if (!$files_view->file_exists($filename)) { return false; @@ -110,6 +94,8 @@ 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_FilesystemView('/'.$uid.'/files_versions'); + $versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath(''); $matches=glob($versionsFolderName.'/'.$filename.'.v*'); sort($matches); $parts=explode('.v',end($matches)); @@ -120,8 +106,10 @@ class Storage { // create all parent folders - $info=pathinfo($filename); - if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true); + $dirname = dirname($filename); + if(!$users_view->file_exists('/files_versions/'.$dirname)) { + $users_view->mkdir('/files_versions/'.$dirname,0700,true); + } // store a new version of a file $users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time()); @@ -138,17 +126,8 @@ class Storage { public static function rollback($filename,$revision) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - $users_view = \OCP\Files::getStorage("files_versions"); - $users_view->chroot(\OCP\User::getUser().'/'); - - //FIXME OC_Share no longer exists - //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) { - // $pos = strpos($source, '/files', 1); - // $uid = substr($source, 1, $pos - 1); - // $filename = substr($source, $pos + 6); - //} else { - $uid = \OCP\User::getUser(); - //} + list($uid, $filename) = self::getUidAndFilename($filename); + $users_view = new \OC_FilesystemView('/'.$uid); // rollback if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) { @@ -170,12 +149,8 @@ class Storage { */ public static function isversioned($filename) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { - $versions_fileview = \OCP\Files::getStorage("files_versions"); - //FIXME OC_Share no longer exists - //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) { - // $pos = strpos($source, '/files', 1); - // $filename = substr($source, $pos + 6); - //} + list($uid, $filename) = self::getUidAndFilename($filename); + $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions'); $versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath(''); @@ -202,16 +177,9 @@ class Storage { public static function getVersions( $filename, $count = 0 ) { if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) { + list($uid, $filename) = self::getUidAndFilename($filename); + $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions'); - //FIXME OC_Share no longer exists - //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) { - // $pos = strpos($source, '/files', 1); - // $uid = substr($source, 1, $pos - 1); - // $filename = substr($source, $pos + 6); - //} else { - $uid = \OCP\User::getUser(); - //} - $versions_fileview = \OCP\Files::getStorage('files_versions'); $versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath(''); $versions = array(); @@ -222,7 +190,7 @@ class Storage { $i = 0; - $files_view = \OCP\Files::getStorage('files'); + $files_view = new \OC_FilesystemView('/'.$uid.'/files'); $local_file = $files_view->getLocalFile($filename); foreach( $matches as $ma ) { @@ -276,16 +244,9 @@ class Storage { */ public static function expire($filename) { if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') { + list($uid, $filename) = self::getUidAndFilename($filename); + $versions_fileview = new \OC_FilesystemView('/'.$uid.'/files_versions'); - //FIXME OC_Share no longer exists - //if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) { - // $pos = strpos($source, '/files', 1); - // $uid = substr($source, 1, $pos - 1); - // $filename = substr($source, $pos + 6); - //} else { - $uid = \OCP\User::getUser(); - //} - $versions_fileview = \OCP\Files::getStorage("files_versions"); $versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath(''); // check for old versions @@ -293,7 +254,7 @@ class Storage { if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) { - $numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ); + $numberToDelete = count($matches) - \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ); // delete old versions of a file $deleteItems = array_slice( $matches, 0, $numberToDelete ); @@ -312,6 +273,7 @@ class Storage { * @return true/false */ public function expireAll() { - return $this->view->deleteAll('', true); + $view = \OCP\Files::getStorage('files_versions'); + return $view->deleteAll('', true); } } diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php new file mode 100644 index 00000000000..9c0eb23a34c --- /dev/null +++ b/apps/user_ldap/l10n/ru_RU.php @@ -0,0 +1,15 @@ +<?php $TRANSLATIONS = array( +"Host" => "Хост", +"Base DN" => "База DN", +"User DN" => "DN пользователя", +"Password" => "Пароль", +"For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте поля DN и пароль пустыми.", +"Group Filter" => "Групповой фильтр", +"Port" => "Порт", +"Use TLS" => "Использовать TLS", +"Do not use it for SSL connections, it will fail." => "Не используйте это SSL-соединений, это не будет выполнено.", +"Turn off SSL certificate validation." => "Выключить проверку сертификата SSL.", +"in bytes" => "в байтах", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут.", +"Help" => "Помощь" +); diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php new file mode 100644 index 00000000000..5f6200db404 --- /dev/null +++ b/apps/user_ldap/l10n/zh_CN.php @@ -0,0 +1,9 @@ +<?php $TRANSLATIONS = array( +"Host" => "主机", +"Base DN" => "Base DN", +"You can specify Base DN for users and groups in the Advanced tab" => "您可以在高级选项卡里为用户和组指定Base DN", +"User DN" => "User DN", +"Password" => "密码", +"Port" => "端口", +"Help" => "帮助" +); diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php index 53619ab4c1d..d855ae2a163 100644 --- a/apps/user_ldap/lib/access.php +++ b/apps/user_ldap/lib/access.php @@ -206,21 +206,17 @@ abstract class Access { $dn = $this->sanitizeDN($dn); $table = $this->getMapTable($isUser); if($isUser) { + $fncFindMappedName = 'findMappedUser'; $nameAttribute = $this->connection->ldapUserDisplayName; } else { + $fncFindMappedName = 'findMappedGroup'; $nameAttribute = $this->connection->ldapGroupDisplayName; } - $query = \OCP\DB::prepare(' - SELECT `owncloud_name` - FROM `'.$table.'` - WHERE `ldap_dn` = ? - '); - //let's try to retrieve the ownCloud name from the mappings table - $component = $query->execute(array($dn))->fetchOne(); - if($component) { - return $component; + $ocname = $this->$fncFindMappedName($dn); + if($ocname) { + return $ocname; } //second try: get the UUID and check if it is known. Then, update the DN and return the name. @@ -295,25 +291,48 @@ abstract class Access { return $this->ldap2ownCloudNames($ldapGroups, false); } + private function findMappedUser($dn) { + static $query = null; + if(is_null($query)) { + $query = \OCP\DB::prepare(' + SELECT `owncloud_name` + FROM `'.$this->getMapTable(true).'` + WHERE `ldap_dn` = ?' + ); + } + $res = $query->execute(array($dn))->fetchOne(); + if($res) { + return $res; + } + return false; + } + + private function findMappedGroup($dn) { + static $query = null; + if(is_null($query)) { + $query = \OCP\DB::prepare(' + SELECT `owncloud_name` + FROM `'.$this->getMapTable(false).'` + WHERE `ldap_dn` = ?' + ); + } + $res = $query->execute(array($dn))->fetchOne(); + if($res) { + return $res; + } + return false; + } + + private function ldap2ownCloudNames($ldapObjects, $isUsers) { if($isUsers) { - $knownObjects = $this->mappedUsers(); $nameAttribute = $this->connection->ldapUserDisplayName; } else { - $knownObjects = $this->mappedGroups(); $nameAttribute = $this->connection->ldapGroupDisplayName; } $ownCloudNames = array(); foreach($ldapObjects as $ldapObject) { - $key = \OCP\Util::recursiveArraySearch($knownObjects, $ldapObject['dn']); - - //everything is fine when we know the group - if($key !== false) { - $ownCloudNames[] = $knownObjects[$key]['owncloud_name']; - continue; - } - $ocname = $this->dn2ocname($ldapObject['dn'], $ldapObject[$nameAttribute], $isUsers); if($ocname) { $ownCloudNames[] = $ocname; diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php index 1922e7ff1f2..bf65d9ad91c 100644 --- a/apps/user_ldap/lib/connection.php +++ b/apps/user_ldap/lib/connection.php @@ -258,7 +258,7 @@ class Connection { if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) { \OCP\Util::writeLog('user_ldap', 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO); } - if(!in_array($this->config['ldapUuidAttribute'], array('auto','entryuuid', 'nsuniqueid', 'objectguid'))) { + if(!in_array($this->config['ldapUuidAttribute'], array('auto','entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) { \OCP\Config::setAppValue($this->configID, 'ldap_uuid_attribute', 'auto'); \OCP\Util::writeLog('user_ldap', 'Illegal value for the UUID Attribute, reset to autodetect.', \OCP\Util::INFO); } @@ -357,4 +357,4 @@ class Connection { return true; } -}
\ No newline at end of file +} diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php index aff519226c8..b265a8339ef 100644 --- a/apps/user_ldap/lib/jobs.php +++ b/apps/user_ldap/lib/jobs.php @@ -43,7 +43,7 @@ class Jobs { if(empty($actualGroups) && empty($knownGroups)) { \OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – groups do not seem to be configured properly, aborting.', \OCP\Util::INFO); - \OCP\setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time()); + \OCP\Config::setAppValue('user_ldap', 'bgjUpdateGroupsLastRun', time()); return; } diff --git a/core/css/share.css b/core/css/share.css index 872509220d7..c2fa051b129 100644 --- a/core/css/share.css +++ b/core/css/share.css @@ -18,3 +18,5 @@ a.unshare:hover { opacity:1; } #link { border-top:1px solid #ddd; padding-top:0.5em; } #dropdown input[type="text"], #dropdown input[type="password"] { width:90%; } #linkText, #linkPass, #expiration { display:none; } +#link #showPassword img { width:12px; padding-left: 0.3em; } +#link label, #expiration label{ padding-left: 0.5em; }
\ No newline at end of file diff --git a/core/css/styles.css b/core/css/styles.css index 6bf3757df25..7d855556c84 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -143,6 +143,10 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd .exception{color: #000000;} .exception textarea{width:95%;height: 200px;background:#ffe;border:0;} +.ui-icon-circle-triangle-e{ background-image: url('../img/actions/play-next.svg'); } +.ui-icon-circle-triangle-w{ background-image: url('../img/actions/play-previous.svg'); } +.ui-datepicker-prev,.ui-datepicker-next{ border: 1px solid #ddd; background: #ffffff; } + /* ---- DIALOGS ---- */ #dirtree {width: 100%;} #filelist {height: 270px; overflow:scroll; background-color: white; width: 100%;} diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 4dd3c89c14d..2467af61121 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -106,7 +106,7 @@ var OCdialogs = { var c_name = 'oc-dialog-'+OCdialogs.dialogs_counter+'-content'; var c_id = '#'+c_name; var d = '<div id="'+c_name+'" title="'+title+'"><select id="dirtree"><option value="0">'+OC.currentUser+'</option></select><div id="filelist"></div><div class="filepicker_loader"><img src="'+OC.filePath('gallery','img','loading.gif')+'"></div></div>'; - if (!modal) modal = false; // Huh..? + if (!modal) modal = false; // Huh.. if (!multiselect) multiselect = false; $('body').append(d); $(c_id + ' #dirtree').focus(function() { @@ -120,7 +120,7 @@ var OCdialogs = { }).data('multiselect', multiselect).data('mimetype',mimetype_filter); // build buttons var b = [{ - text: t('dialogs', 'Choose'), + text: t('core', 'Choose'), click: function(){ if (callback != undefined) { var p; @@ -140,7 +140,7 @@ var OCdialogs = { } }, { - text: t('dialogs', 'Cancel'), + text: t('core', 'Cancel'), click: function(){$(c_id).dialog('close'); }} ]; $(c_id).dialog({width: ((4*$('body').width())/9), height: 400, modal: modal, buttons: b}); @@ -156,11 +156,11 @@ var OCdialogs = { var b = []; switch (buttons) { case OCdialogs.YES_NO_BUTTONS: - b[1] = {text: t('dialogs', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }}; - b[0] = {text: t('dialogs', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}}; + b[1] = {text: t('core', 'No'), click: function(){ if (callback != undefined) callback(false); $(c_id).dialog('close'); }}; + b[0] = {text: t('core', 'Yes'), click: function(){ if (callback != undefined) callback(true); $(c_id).dialog('close');}}; break; case OCdialogs.OK_CANCEL_BUTTONS: - b[1] = {text: t('dialogs', 'Cancel'), click: function(){$(c_id).dialog('close'); }}; + b[1] = {text: t('core', 'Cancel'), click: function(){$(c_id).dialog('close'); }}; case OCdialogs.OK_BUTTON: // fallthrough var f; switch(dialog_type) { @@ -174,7 +174,7 @@ var OCdialogs = { f = function(){OCdialogs.form_ok_handler(callback, c_id)}; break; } - b[0] = {text: t('dialogs', 'Ok'), click: f}; + b[0] = {text: t('core', 'Ok'), click: f}; break; } var possible_height = ($('tr', d).size()+1)*30; diff --git a/core/js/share.js b/core/js/share.js index b4ca6892c68..c105a27dc0e 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -79,7 +79,7 @@ OC.Share={ var item = itemSource; } if (typeof OC.Share.statuses[item] === 'undefined') { - // NOTE: Check doesn't always work and misses some shares, fix later + // NOTE: Check does not always work and misses some shares, fix later checkShares = true; } else { checkShares = true; @@ -100,7 +100,7 @@ OC.Share={ callback(result.data); } } else { - OC.dialogs.alert(result.data.message, 'Error while sharing'); + OC.dialogs.alert(result.data.message, t('core', 'Error while sharing')); } }); }, @@ -111,14 +111,14 @@ OC.Share={ callback(); } } else { - OC.dialogs.alert('Error', 'Error while unsharing'); + OC.dialogs.alert(t('core', 'Error'), t('core', 'Error while unsharing')); } }); }, setPermissions:function(itemType, itemSource, shareType, shareWith, permissions) { $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setPermissions', itemType: itemType, itemSource: itemSource, shareType: shareType, shareWith: shareWith, permissions: permissions }, function(result) { if (!result || result.status !== 'success') { - OC.dialogs.alert('Error', 'Error while changing permissions'); + OC.dialogs.alert(t('core', 'Error'), t('core', 'Error while changing permissions')); } }); }, @@ -127,30 +127,30 @@ OC.Share={ var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">'; if (data.reshare) { if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) { - html += '<span class="reshare">Shared with you and the group '+data.reshare.share_with+' by '+data.reshare.uid_owner+'</span>'; + html += '<span class="reshare">'+t('core', 'Shared with you and the group %s by %s', data.reshare.share_with, data.reshare.uid_owner)+'</span>'; } else { - html += '<span class="reshare">Shared with you by '+data.reshare.uid_owner+'</span>'; + html += '<span class="reshare">'+t('core', 'Shared with you by %s', data.reshare.uid_owner)+'</span>'; } html += '<br />'; } if (possiblePermissions & OC.PERMISSION_SHARE) { - html += '<input id="shareWith" type="text" placeholder="Share with" />'; + html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />'; html += '<ul id="shareWithList">'; html += '</ul>'; if (link) { html += '<div id="link">'; - html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">Share with link</label>'; - html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>'; + html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">'+t('core', 'Share with link')+'</label>'; + html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="'+t('core', 'Password protect')+'" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>'; html += '<br />'; html += '<input id="linkText" type="text" readonly="readonly" />'; html += '<div id="linkPass">'; - html += '<input id="linkPassText" type="password" placeholder="Password" />'; + html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />'; html += '</div>'; html += '</div>'; } html += '<div id="expiration">'; - html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">Set expiration date</label>'; - html += '<input id="expirationDate" type="text" placeholder="Expiration date" style="display:none; width:90%;" />'; + html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>'; + html += '<input id="expirationDate" type="text" placeholder="'+t('core', 'Expiration date')+'" style="display:none; width:90%;" />'; html += '</div>'; $(html).appendTo(appendTo); // Reset item shares @@ -179,9 +179,9 @@ OC.Share={ // Suggest sharing via email if valid email address // var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i); // if (pattern.test(search.term)) { -// response([{label: 'Share via email: '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]); +// response([{label: t('core', 'Share via email: %s', search.term), value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]); // } else { - response(['No people found']); + response([t('core', 'No people found')]); // } } }); @@ -207,7 +207,7 @@ OC.Share={ } }); } else { - html += '<input id="shareWith" type="text" placeholder="Resharing is not allowed" style="width:90%;" disabled="disabled"/>'; + html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Resharing is not allowed')+'" style="width:90%;" disabled="disabled"/>'; html += '</div>'; $(html).appendTo(appendTo); } @@ -243,7 +243,7 @@ OC.Share={ if (collectionList.length > 0) { $(collectionList).append(', '+shareWith); } else { - var html = '<li style="clear: both;" data-collection="'+item+'">Shared in '+item+' with '+shareWith+'</li>'; + var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in %s with %s', item, shareWith)+'</li>'; $('#shareWithList').prepend(html); } } else { @@ -264,6 +264,7 @@ OC.Share={ shareChecked = 'checked="checked"'; } var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'">'; + html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="'+t('core', 'Unshare')+'" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>'; html += shareWith; if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) { if (editChecked == '') { @@ -271,22 +272,21 @@ OC.Share={ } else { html += '<label>'; } - html += '<input type="checkbox" name="edit" class="permissions" '+editChecked+' />can edit</label>'; + html += '<input type="checkbox" name="edit" class="permissions" '+editChecked+' />'+t('core', 'can edit')+'</label>'; } - html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>'; - html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>'; + html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="'+t('core', 'access control')+'" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>'; html += '<div class="cruds" style="display:none;">'; if (possiblePermissions & OC.PERMISSION_CREATE) { - html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />create</label>'; + html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />'+t('core', 'create')+'</label>'; } if (possiblePermissions & OC.PERMISSION_UPDATE) { - html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.PERMISSION_UPDATE+'" />update</label>'; + html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.PERMISSION_UPDATE+'" />'+t('core', 'update')+'</label>'; } if (possiblePermissions & OC.PERMISSION_DELETE) { - html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.PERMISSION_DELETE+'" />delete</label>'; + html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.PERMISSION_DELETE+'" />'+t('core', 'delete')+'</label>'; } if (possiblePermissions & OC.PERMISSION_SHARE) { - html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />share</label>'; + html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />'+t('core', 'share')+'</label>'; } html += '</div>'; html += '</li>'; @@ -310,7 +310,7 @@ OC.Share={ $('#showPassword').show(); if (password != null) { $('#linkPass').show('blind'); - $('#linkPassText').attr('placeholder', 'Password protected'); + $('#linkPassText').attr('placeholder', t('core', 'Password protected')); } $('#expiration').show(); }, @@ -460,7 +460,7 @@ $(document).ready(function() { var itemSource = $('#dropdown').data('item-source'); OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() { $('#linkPassText').val(''); - $('#linkPassText').attr('placeholder', 'Password protected'); + $('#linkPassText').attr('placeholder', t('core', 'Password protected')); }); } }); @@ -482,7 +482,7 @@ $(document).ready(function() { var itemSource = $('#dropdown').data('item-source'); $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) { if (!result || result.status !== 'success') { - OC.dialogs.alert('Error', 'Error setting expiration date'); + OC.dialogs.alert(t('core', 'Error'), t('core', 'Error setting expiration date')); } }); }); diff --git a/db_structure.xml b/db_structure.xml index 74e2805308a..b1e620f8499 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -1,651 +1,674 @@ <?xml version="1.0" encoding="utf-8" ?> <database> - <name>*dbname*</name> - <create>true</create> - <overwrite>false</overwrite> - - <charset>utf8</charset> - - <table> - - <name>*dbprefix*appconfig</name> - - <declaration> - - <field> - <name>appid</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>configkey</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>configvalue</name> - <type>text</type> - <notnull>true</notnull> - <length>255</length> - </field> - - - - </declaration> - - </table> - - <table> - - <name>*dbprefix*fscache</name> - - <declaration> - - <field> - <name>id</name> - <autoincrement>1</autoincrement> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>4</length> - </field> - - <field> - <name>path</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>512</length> - </field> - - <field> - <name>path_hash</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>32</length> - </field> - - <field> - <name>parent</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>8</length> - </field> - - <field> - <name>name</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>300</length> - </field> - - <field> - <name>user</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>64</length> - </field> - - <field> - <name>size</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>8</length> - </field> - - <field> - <name>ctime</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>8</length> - </field> - - <field> - <name>mtime</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>8</length> - </field> - - <field> - <name>mimetype</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>96</length> - </field> - - <field> - <name>mimepart</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>32</length> - </field> - - <field> - <name>encrypted</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>1</length> - </field> - - <field> - <name>versioned</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>1</length> - </field> - - <field> - <name>writable</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>1</length> - </field> - - <index> - <name>fscache_path_hash_index</name> - <field> - <name>path_hash</name> - <sorting>ascending</sorting> - </field> - </index> - - <index> - <name>parent_index</name> - <field> - <name>parent</name> - <sorting>ascending</sorting> - </field> - </index> - - <index> - <name>name_index</name> - <field> - <name>name</name> - <sorting>ascending</sorting> - </field> - </index> - - <index> - <name>parent_name_index</name> - <field> - <name>parent</name> - <sorting>ascending</sorting> - </field> - <field> - <name>name</name> - <sorting>ascending</sorting> - </field> - </index> - - </declaration> - - </table> - - <table> - - <name>*dbprefix*group_user</name> - - <declaration> - - <field> - <name>gid</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>64</length> - </field> - - <field> - <name>uid</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>64</length> - </field> - - </declaration> - - </table> - - <table> - - <name>*dbprefix*group_admin</name> - - <declaration> - - <field> - <name>gid</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>64</length> - </field> - - <field> - <name>uid</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>64</length> - </field> - - </declaration> - - </table> - - <table> - - <name>*dbprefix*groups</name> - - <declaration> - - <field> - <name>gid</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>64</length> - </field> - - <index> - <name>groups_pKey</name> - <primary>true</primary> - <field> - <name>gid</name> - <sorting>ascending</sorting> - </field> - </index> - - </declaration> - - </table> - - <table> - - <name>*dbprefix*locks</name> - - <declaration> - - <field> - <name>id</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <autoincrement>1</autoincrement> - <unsigned>true</unsigned> - <length>4</length> - </field> - - <field> - <name>userid</name> - <type>text</type> - <default></default> - <notnull>false</notnull> - <length>200</length> - </field> - - <field> - <name>owner</name> - <type>text</type> - <default></default> - <notnull>false</notnull> - <length>100</length> - </field> - - <field> - <name>timeout</name> - <type>integer</type> - <notnull>false</notnull> - <unsigned>true</unsigned> - <length>4</length> - </field> - - <field> - <name>created</name> - <type>integer</type> - <notnull>false</notnull> - <length>8</length> - </field> - - <field> - <name>token</name> - <type>text</type> - <default></default> - <notnull>false</notnull> - <length>100</length> - </field> - - <field> - <name>scope</name> - <type>integer</type> - <notnull>false</notnull> - <length>1</length> - </field> - - <field> - <name>depth</name> - <type>integer</type> - <notnull>false</notnull> - <length>1</length> - </field> - - <field> - <name>uri</name> - <type>clob</type> - <notnull>false</notnull> - </field> - - </declaration> - - </table> - - <table> - - <name>*dbprefix*preferences</name> - - <declaration> - - <field> - <name>userid</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>appid</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>configkey</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>configvalue</name> - <type>clob</type> - <notnull>false</notnull> - </field> - - </declaration> - - </table> - - <table> - - <name>*dbprefix*properties</name> - - <declaration> - - <field> - <name>userid</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>200</length> - </field> - - <field> - <name>propertypath</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>propertyname</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>propertyvalue</name> - <type>text</type> - <notnull>true</notnull> - <length>255</length> - </field> - - </declaration> - - </table> - - <table> - - <name>*dbprefix*share</name> - - <declaration> - - <field> - <name>id</name> - <autoincrement>1</autoincrement> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>4</length> - </field> - - <field> - <name>share_type</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>1</length> - </field> - - <field> - <name>share_with</name> - <type>text</type> - <default></default> - <notnull>false</notnull> - <length>255</length> - </field> - - <field> - <name>uid_owner</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>parent</name> - <type>integer</type> - <notnull>false</notnull> - <length>4</length> - </field> - - <field> - <name>item_type</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>64</length> - </field> - - <field> - <name>item_source</name> - <type>text</type> - <default></default> - <notnull>false</notnull> - <length>255</length> - </field> - - <field> - <name>item_target</name> - <type>text</type> - <default></default> - <notnull>false</notnull> - <length>255</length> - </field> - - <field> - <name>file_source</name> - <type>integer</type> - <notnull>false</notnull> - <length>4</length> - </field> - - <field> - <name>file_target</name> - <type>text</type> - <default></default> - <notnull>false</notnull> - <length>512</length> - </field> - - <field> - <name>permissions</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>1</length> - </field> - - <field> - <name>stime</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>8</length> - </field> - - <field> - <name>accepted</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <length>1</length> - </field> - - <field> - <name>expiration</name> - <type>timestamp</type> - <default></default> - <notnull>false</notnull> - </field> - - </declaration> - - </table> - - <table> - - <name>*dbprefix*queuedtasks</name> - - <declaration> - - <field> - <name>id</name> - <type>integer</type> - <default>0</default> - <notnull>true</notnull> - <autoincrement>1</autoincrement> - <unsigned>true</unsigned> - <length>4</length> - </field> - - <field> - <name>app</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>klass</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>method</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <field> - <name>parameters</name> - <type>text</type> - <notnull>true</notnull> - <length>255</length> - </field> - - - - </declaration> - - </table> - - <table> - - <name>*dbprefix*users</name> - - <declaration> - - <field> - <name>uid</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>64</length> - </field> - - <field> - <name>password</name> - <type>text</type> - <default></default> - <notnull>true</notnull> - <length>255</length> - </field> - - <index> - <name>users_pKey</name> - <primary>true</primary> - <field> - <name>uid</name> - <sorting>ascending</sorting> - </field> - </index> - - </declaration> - - </table> + <name>*dbname*</name> + <create>true</create> + <overwrite>false</overwrite> + + <charset>utf8</charset> + + <table> + + <name>*dbprefix*appconfig</name> + + <declaration> + + <field> + <name>appid</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>configkey</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>configvalue</name> + <type>clob</type> + <notnull>true</notnull> + </field> + + <index> + <name>appconfig_appid_key_index</name> + <field> + <name>appid</name> + <sorting>ascending</sorting> + </field> + <field> + <name>configkey</name> + <sorting>ascending</sorting> + </field> + </index> + + </declaration> + + </table> + + <table> + + <name>*dbprefix*fscache</name> + + <declaration> + + <field> + <name>id</name> + <autoincrement>1</autoincrement> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>4</length> + </field> + + <field> + <name>path</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>512</length> + </field> + + <field> + <name>path_hash</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>32</length> + </field> + + <field> + <name>parent</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>8</length> + </field> + + <field> + <name>name</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>300</length> + </field> + + <field> + <name>user</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>64</length> + </field> + + <field> + <name>size</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>8</length> + </field> + + <field> + <name>ctime</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>8</length> + </field> + + <field> + <name>mtime</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>8</length> + </field> + + <field> + <name>mimetype</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>96</length> + </field> + + <field> + <name>mimepart</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>32</length> + </field> + + <field> + <name>encrypted</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>1</length> + </field> + + <field> + <name>versioned</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>1</length> + </field> + + <field> + <name>writable</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>1</length> + </field> + + <index> + <name>fscache_path_hash_index</name> + <field> + <name>path_hash</name> + <sorting>ascending</sorting> + </field> + </index> + + <index> + <name>parent_index</name> + <field> + <name>parent</name> + <sorting>ascending</sorting> + </field> + </index> + + <index> + <name>name_index</name> + <field> + <name>name</name> + <sorting>ascending</sorting> + </field> + </index> + + <index> + <name>parent_name_index</name> + <field> + <name>parent</name> + <sorting>ascending</sorting> + </field> + <field> + <name>name</name> + <sorting>ascending</sorting> + </field> + </index> + + </declaration> + + </table> + + <table> + + <name>*dbprefix*group_user</name> + + <declaration> + + <field> + <name>gid</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>64</length> + </field> + + <field> + <name>uid</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>64</length> + </field> + + </declaration> + + </table> + + <table> + + <name>*dbprefix*group_admin</name> + + <declaration> + + <field> + <name>gid</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>64</length> + </field> + + <field> + <name>uid</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>64</length> + </field> + + </declaration> + + </table> + + <table> + + <name>*dbprefix*groups</name> + + <declaration> + + <field> + <name>gid</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>64</length> + </field> + + <index> + <name>groups_pKey</name> + <primary>true</primary> + <field> + <name>gid</name> + <sorting>ascending</sorting> + </field> + </index> + + </declaration> + + </table> + + <table> + + <name>*dbprefix*locks</name> + + <declaration> + + <field> + <name>id</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <autoincrement>1</autoincrement> + <unsigned>true</unsigned> + <length>4</length> + </field> + + <field> + <name>userid</name> + <type>text</type> + <default></default> + <notnull>false</notnull> + <length>200</length> + </field> + + <field> + <name>owner</name> + <type>text</type> + <default></default> + <notnull>false</notnull> + <length>100</length> + </field> + + <field> + <name>timeout</name> + <type>integer</type> + <notnull>false</notnull> + <unsigned>true</unsigned> + <length>4</length> + </field> + + <field> + <name>created</name> + <type>integer</type> + <notnull>false</notnull> + <length>8</length> + </field> + + <field> + <name>token</name> + <type>text</type> + <default></default> + <notnull>false</notnull> + <length>100</length> + </field> + + <field> + <name>scope</name> + <type>integer</type> + <notnull>false</notnull> + <length>1</length> + </field> + + <field> + <name>depth</name> + <type>integer</type> + <notnull>false</notnull> + <length>1</length> + </field> + + <field> + <name>uri</name> + <type>clob</type> + <notnull>false</notnull> + </field> + + </declaration> + + </table> + + <table> + + <name>*dbprefix*preferences</name> + + <declaration> + + <field> + <name>userid</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>appid</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>configkey</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>configvalue</name> + <type>clob</type> + <notnull>false</notnull> + </field> + + <index> + <name>pref_userid_appid_key_index</name> + <field> + <name>userid</name> + <sorting>ascending</sorting> + </field> + <field> + <name>appid</name> + <sorting>ascending</sorting> + </field> + <field> + <name>configkey</name> + <sorting>ascending</sorting> + </field> + </index> + + </declaration> + + </table> + + <table> + + <name>*dbprefix*properties</name> + + <declaration> + + <field> + <name>userid</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>200</length> + </field> + + <field> + <name>propertypath</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>propertyname</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>propertyvalue</name> + <type>text</type> + <notnull>true</notnull> + <length>255</length> + </field> + + </declaration> + + </table> + + <table> + + <name>*dbprefix*share</name> + + <declaration> + + <field> + <name>id</name> + <autoincrement>1</autoincrement> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>4</length> + </field> + + <field> + <name>share_type</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>1</length> + </field> + + <field> + <name>share_with</name> + <type>text</type> + <default></default> + <notnull>false</notnull> + <length>255</length> + </field> + + <field> + <name>uid_owner</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>parent</name> + <type>integer</type> + <notnull>false</notnull> + <length>4</length> + </field> + + <field> + <name>item_type</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>64</length> + </field> + + <field> + <name>item_source</name> + <type>text</type> + <default></default> + <notnull>false</notnull> + <length>255</length> + </field> + + <field> + <name>item_target</name> + <type>text</type> + <default></default> + <notnull>false</notnull> + <length>255</length> + </field> + + <field> + <name>file_source</name> + <type>integer</type> + <notnull>false</notnull> + <length>4</length> + </field> + + <field> + <name>file_target</name> + <type>text</type> + <default></default> + <notnull>false</notnull> + <length>512</length> + </field> + + <field> + <name>permissions</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>1</length> + </field> + + <field> + <name>stime</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>8</length> + </field> + + <field> + <name>accepted</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <length>1</length> + </field> + + <field> + <name>expiration</name> + <type>timestamp</type> + <default></default> + <notnull>false</notnull> + </field> + + </declaration> + + </table> + + <table> + + <name>*dbprefix*queuedtasks</name> + + <declaration> + + <field> + <name>id</name> + <type>integer</type> + <default>0</default> + <notnull>true</notnull> + <autoincrement>1</autoincrement> + <unsigned>true</unsigned> + <length>4</length> + </field> + + <field> + <name>app</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>klass</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>method</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <field> + <name>parameters</name> + <type>text</type> + <notnull>true</notnull> + <length>255</length> + </field> + + </declaration> + + </table> + + <table> + + <name>*dbprefix*users</name> + + <declaration> + + <field> + <name>uid</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>64</length> + </field> + + <field> + <name>password</name> + <type>text</type> + <default></default> + <notnull>true</notnull> + <length>255</length> + </field> + + <index> + <name>users_pKey</name> + <primary>true</primary> + <field> + <name>uid</name> + <sorting>ascending</sorting> + </field> + </index> + + </declaration> + + </table> </database> diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po index 4b5158157bc..420e26a8b37 100644 --- a/l10n/cs_CZ/settings.po +++ b/l10n/cs_CZ/settings.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 17:40+0000\n" +"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -228,7 +228,7 @@ msgstr "Odpověď" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Použili jste <strong>%s</strong> z dostupných <strong>%s<strong>" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -240,7 +240,7 @@ msgstr "Stáhnout" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Vaše heslo bylo změněno" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/de/settings.po b/l10n/de/settings.po index 4ebadf6d0ff..de2fc62bcee 100644 --- a/l10n/de/settings.po +++ b/l10n/de/settings.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 21:46+0000\n" "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -234,7 +234,7 @@ msgstr "Antwort" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s<strong>" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -246,7 +246,7 @@ msgstr "Download" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Ihr Passwort wurde geändert." #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/el/files.po b/l10n/el/files.po index 0912afaf796..6df1115e256 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -5,15 +5,16 @@ # Translators: # Dimitris M. <monopatis@gmail.com>, 2012. # Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012. +# Efstathios Iosifidis <iosifidis@opensuse.org>, 2012. # Marios Bekatoros <>, 2012. -# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011, 2012. +# Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-18 02:01+0200\n" -"PO-Revision-Date: 2012-09-18 00:01+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 23:08+0000\n" +"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -41,15 +42,15 @@ msgstr "Το αρχείο μεταφορώθηκε μόνο εν μέρει" #: ajax/upload.php:24 msgid "No file was uploaded" -msgstr "Το αρχείο δεν μεταφορτώθηκε" +msgstr "Κανένα αρχείο δεν μεταφορτώθηκε" #: ajax/upload.php:25 msgid "Missing a temporary folder" -msgstr "Λείπει ένας προσωρινός φάκελος" +msgstr "Λείπει ο προσωρινός φάκελος" #: ajax/upload.php:26 msgid "Failed to write to disk" -msgstr "Η εγγραφή στο δίσκο απέτυχε" +msgstr "Αποτυχία εγγραφής στο δίσκο" #: appinfo/app.php:6 msgid "Files" @@ -63,39 +64,39 @@ msgstr "Διακοπή κοινής χρήσης" msgid "Delete" msgstr "Διαγραφή" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "already exists" msgstr "υπάρχει ήδη" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "replace" msgstr "αντικατέστησε" -#: js/filelist.js:186 +#: js/filelist.js:188 msgid "suggest name" msgstr "συνιστώμενο όνομα" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "cancel" msgstr "ακύρωση" -#: js/filelist.js:235 js/filelist.js:237 +#: js/filelist.js:237 js/filelist.js:239 msgid "replaced" msgstr "αντικαταστάθηκε" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:267 js/filelist.js:269 +#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273 msgid "undo" msgstr "αναίρεση" -#: js/filelist.js:237 +#: js/filelist.js:239 msgid "with" msgstr "με" -#: js/filelist.js:267 +#: js/filelist.js:271 msgid "unshared" -msgstr "Διακόπηκε η κοινή χρήση" +msgstr "Διακόπηκε ο διαμοιρασμός" -#: js/filelist.js:269 +#: js/filelist.js:273 msgid "deleted" msgstr "διαγράφηκε" @@ -113,7 +114,7 @@ msgstr "Σφάλμα Μεταφόρτωσης" #: js/files.js:236 js/files.js:341 js/files.js:370 msgid "Pending" -msgstr "Εν αναμονή" +msgstr "Εκκρεμεί" #: js/files.js:355 msgid "Upload cancelled." @@ -130,11 +131,11 @@ msgstr "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται." #: js/files.js:666 msgid "files scanned" -msgstr "" +msgstr "αρχεία σαρώθηκαν" #: js/files.js:674 msgid "error while scanning" -msgstr "" +msgstr "σφάλμα κατά την ανίχνευση" #: js/files.js:748 templates/index.php:56 msgid "Size" @@ -214,7 +215,7 @@ msgstr "Μεταφόρτωση" #: templates/index.php:27 msgid "Cancel upload" -msgstr "Ακύρωση ανεβάσματος" +msgstr "Ακύρωση μεταφόρτωσης" #: templates/index.php:40 msgid "Nothing in here. Upload something!" @@ -226,7 +227,7 @@ msgstr "Όνομα" #: templates/index.php:50 msgid "Share" -msgstr "Διαμοίρασε" +msgstr "Διαμοιρασμός" #: templates/index.php:52 msgid "Download" @@ -234,17 +235,17 @@ msgstr "Λήψη" #: templates/index.php:75 msgid "Upload too large" -msgstr "Πολύ μεγάλο το αρχείο προς μεταφόρτωση" +msgstr "Πολύ μεγάλο αρχείο προς μεταφόρτωση" #: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." -msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή." +msgstr "Τα αρχεία που προσπαθείτε να μεταφορτώσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή." #: templates/index.php:82 msgid "Files are being scanned, please wait." -msgstr "Τα αρχεία ανιχνεύονται, παρακαλώ περιμένετε" +msgstr "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε" #: templates/index.php:85 msgid "Current scanning" diff --git a/l10n/el/lib.po b/l10n/el/lib.po index 2a3ab249c25..754ee2ab0df 100644 --- a/l10n/el/lib.po +++ b/l10n/el/lib.po @@ -8,37 +8,37 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-01 02:01+0200\n" -"PO-Revision-Date: 2012-09-01 00:02+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 23:21+0000\n" +"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: el\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: app.php:288 +#: app.php:285 msgid "Help" msgstr "Βοήθεια" -#: app.php:295 +#: app.php:292 msgid "Personal" msgstr "Προσωπικά" -#: app.php:300 +#: app.php:297 msgid "Settings" msgstr "Ρυθμίσεις" -#: app.php:305 +#: app.php:302 msgid "Users" msgstr "Χρήστες" -#: app.php:312 +#: app.php:309 msgid "Apps" msgstr "Εφαρμογές" -#: app.php:314 +#: app.php:311 msgid "Admin" msgstr "Διαχειριστής" @@ -68,59 +68,59 @@ msgstr "Σφάλμα πιστοποίησης" #: json.php:51 msgid "Token expired. Please reload page." -msgstr "Το αναγνωριστικό έληξε. Παρακαλώ επανα-φορτώστε την σελίδα." +msgstr "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα." -#: template.php:86 +#: template.php:87 msgid "seconds ago" msgstr "δευτερόλεπτα πριν" -#: template.php:87 +#: template.php:88 msgid "1 minute ago" msgstr "1 λεπτό πριν" -#: template.php:88 +#: template.php:89 #, php-format msgid "%d minutes ago" msgstr "%d λεπτά πριν" -#: template.php:91 +#: template.php:92 msgid "today" msgstr "σήμερα" -#: template.php:92 +#: template.php:93 msgid "yesterday" msgstr "χθές" -#: template.php:93 +#: template.php:94 #, php-format msgid "%d days ago" msgstr "%d ημέρες πριν" -#: template.php:94 +#: template.php:95 msgid "last month" msgstr "τον προηγούμενο μήνα" -#: template.php:95 +#: template.php:96 msgid "months ago" msgstr "μήνες πριν" -#: template.php:96 +#: template.php:97 msgid "last year" msgstr "τον προηγούμενο χρόνο" -#: template.php:97 +#: template.php:98 msgid "years ago" msgstr "χρόνια πριν" #: updater.php:66 #, php-format msgid "%s is available. Get <a href=\"%s\">more information</a>" -msgstr "" +msgstr "%s είναι διαθέσιμα. Δείτε <a href=\"%s\">περισσότερες πληροφορίες</a>" #: updater.php:68 msgid "up to date" -msgstr "" +msgstr "ενημερωμένο" #: updater.php:71 msgid "updates check is disabled" -msgstr "" +msgstr "ο έλεγχος ενημερώσεων είναι απενεργοποιημένος" diff --git a/l10n/el/settings.po b/l10n/el/settings.po index b093e0f1fc0..6ae56f02706 100644 --- a/l10n/el/settings.po +++ b/l10n/el/settings.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 22:58+0000\n" +"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -230,7 +230,7 @@ msgstr "Απάντηση" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Έχετε χρησιμοποιήσει <strong>%s</strong> από τα διαθέσιμα <strong>%s<strong>" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -238,11 +238,11 @@ msgstr "Πελάτες συγχρονισμού για Desktop και Mobile" #: templates/personal.php:13 msgid "Download" -msgstr "Κατέβασε" +msgstr "Λήψη" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Το συνθηματικό σας έχει αλλάξει" #: templates/personal.php:20 msgid "Unable to change your password" @@ -250,11 +250,11 @@ msgstr "Δεν ήταν δυνατή η αλλαγή του κωδικού πρ #: templates/personal.php:21 msgid "Current password" -msgstr "Τρέχων κωδικός πρόσβασης" +msgstr "Τρέχων συνθηματικό" #: templates/personal.php:22 msgid "New password" -msgstr "Νέος κωδικός" +msgstr "Νέο συνθηματικό" #: templates/personal.php:23 msgid "show" @@ -262,7 +262,7 @@ msgstr "εμφάνιση" #: templates/personal.php:24 msgid "Change password" -msgstr "Αλλαγή κωδικού πρόσβασης" +msgstr "Αλλαγή συνθηματικού" #: templates/personal.php:30 msgid "Email" @@ -274,7 +274,7 @@ msgstr "Διεύθυνση ηλεκτρονικού ταχυδρομείου σ #: templates/personal.php:32 msgid "Fill in an email address to enable password recovery" -msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση κωδικού πρόσβασης" +msgstr "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού" #: templates/personal.php:38 templates/personal.php:39 msgid "Language" @@ -294,7 +294,7 @@ msgstr "Όνομα" #: templates/users.php:23 templates/users.php:77 msgid "Password" -msgstr "Κωδικός" +msgstr "Συνθηματικό" #: templates/users.php:26 templates/users.php:78 templates/users.php:98 msgid "Groups" diff --git a/l10n/eu/files.po b/l10n/eu/files.po index c90216557e3..18b25b4e1f1 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-18 02:01+0200\n" -"PO-Revision-Date: 2012-09-18 00:01+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 09:47+0000\n" +"Last-Translator: asieriko <asieriko@gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,39 +61,39 @@ msgstr "Ez partekatu" msgid "Delete" msgstr "Ezabatu" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "already exists" msgstr "dagoeneko existitzen da" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "replace" msgstr "ordeztu" -#: js/filelist.js:186 +#: js/filelist.js:188 msgid "suggest name" msgstr "aholkatu izena" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "cancel" msgstr "ezeztatu" -#: js/filelist.js:235 js/filelist.js:237 +#: js/filelist.js:237 js/filelist.js:239 msgid "replaced" msgstr "ordeztua" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:267 js/filelist.js:269 +#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273 msgid "undo" msgstr "desegin" -#: js/filelist.js:237 +#: js/filelist.js:239 msgid "with" msgstr "honekin" -#: js/filelist.js:267 +#: js/filelist.js:271 msgid "unshared" msgstr "Ez partekatuta" -#: js/filelist.js:269 +#: js/filelist.js:273 msgid "deleted" msgstr "ezabatuta" @@ -109,7 +109,7 @@ msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu" msgid "Upload Error" msgstr "Igotzean errore bat suertatu da" -#: js/files.js:236 js/files.js:341 js/files.js:370 +#: js/files.js:236 js/files.js:341 js/files.js:371 msgid "Pending" msgstr "Zain" @@ -117,44 +117,44 @@ msgstr "Zain" msgid "Upload cancelled." msgstr "Igoera ezeztatuta" -#: js/files.js:423 +#: js/files.js:424 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du." -#: js/files.js:493 +#: js/files.js:494 msgid "Invalid name, '/' is not allowed." msgstr "Baliogabeko izena, '/' ezin da erabili. " -#: js/files.js:666 +#: js/files.js:667 msgid "files scanned" -msgstr "" +msgstr "fitxategiak eskaneatuta" -#: js/files.js:674 +#: js/files.js:675 msgid "error while scanning" -msgstr "" +msgstr "errore bat egon da eskaneatzen zen bitartean" -#: js/files.js:748 templates/index.php:56 +#: js/files.js:749 templates/index.php:56 msgid "Size" msgstr "Tamaina" -#: js/files.js:749 templates/index.php:58 +#: js/files.js:750 templates/index.php:58 msgid "Modified" msgstr "Aldatuta" -#: js/files.js:776 +#: js/files.js:777 msgid "folder" msgstr "karpeta" -#: js/files.js:778 +#: js/files.js:779 msgid "folders" msgstr "Karpetak" -#: js/files.js:786 +#: js/files.js:787 msgid "file" msgstr "fitxategia" -#: js/files.js:788 +#: js/files.js:789 msgid "files" msgstr "fitxategiak" diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po index c77fa0cef96..0d1dde9b907 100644 --- a/l10n/eu/files_versions.po +++ b/l10n/eu/files_versions.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-17 02:02+0200\n" -"PO-Revision-Date: 2012-09-17 00:04+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 08:37+0000\n" +"Last-Translator: asieriko <asieriko@gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,8 +32,8 @@ msgstr "Honek zure fitxategien bertsio guztiak ezabatuko ditu" #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "Fitxategien Bertsioak" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "Gaitu" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index b581d579cc3..6b7e9ae2ff5 100644 --- a/l10n/eu/settings.po +++ b/l10n/eu/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 09:46+0000\n" +"Last-Translator: asieriko <asieriko@gmail.com>\n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -114,7 +114,7 @@ msgstr "Cron" #: templates/admin.php:37 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "Exekutatu zeregin bat orri karga bakoitzean" #: templates/admin.php:43 msgid "" @@ -126,11 +126,11 @@ msgstr "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orri msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez." #: templates/admin.php:56 msgid "Sharing" -msgstr "" +msgstr "Partekatzea" #: templates/admin.php:61 msgid "Enable Share API" @@ -225,7 +225,7 @@ msgstr "Erantzun" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Eskuragarri dituzun <strong>%s</strong>etik <strong>%s</strong> erabili duzu" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -237,7 +237,7 @@ msgstr "Deskargatu" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Zere pasahitza aldatu da" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po index 3d51946792b..32e588ad004 100644 --- a/l10n/fi_FI/settings.po +++ b/l10n/fi_FI/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 18:06+0000\n" +"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n" "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -225,7 +225,7 @@ msgstr "Vastaus" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Käytössäsi on <strong>%s</strong>/<strong>%s<strong>" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -237,7 +237,7 @@ msgstr "Lataa" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Salasanasi vaihdettiin" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/it/settings.po b/l10n/it/settings.po index 6b8700b543d..9b7f3967cfc 100644 --- a/l10n/it/settings.po +++ b/l10n/it/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 05:42+0000\n" +"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n" "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -229,7 +229,7 @@ msgstr "Risposta" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Hai utilizzato <strong>%s</strong> dei <strong>%s<strong> disponibili" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -241,7 +241,7 @@ msgstr "Scaricamento" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "La tua password è cambiata" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index 18748ab64d8..cdb813f426e 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/files.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-18 02:01+0200\n" -"PO-Revision-Date: 2012-09-18 00:01+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 01:00+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,39 +61,39 @@ msgstr "共有しない" msgid "Delete" msgstr "削除" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "already exists" msgstr "既に存在します" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "replace" msgstr "置き換え" -#: js/filelist.js:186 +#: js/filelist.js:188 msgid "suggest name" msgstr "推奨名称" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "cancel" msgstr "キャンセル" -#: js/filelist.js:235 js/filelist.js:237 +#: js/filelist.js:237 js/filelist.js:239 msgid "replaced" msgstr "置換：" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:267 js/filelist.js:269 +#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273 msgid "undo" msgstr "元に戻す" -#: js/filelist.js:237 +#: js/filelist.js:239 msgid "with" msgstr "←" -#: js/filelist.js:267 +#: js/filelist.js:271 msgid "unshared" msgstr "未共有" -#: js/filelist.js:269 +#: js/filelist.js:273 msgid "deleted" msgstr "削除" @@ -109,7 +109,7 @@ msgstr "アップロード使用としているファイルがディレクトリ msgid "Upload Error" msgstr "アップロードエラー" -#: js/files.js:236 js/files.js:341 js/files.js:370 +#: js/files.js:236 js/files.js:341 js/files.js:371 msgid "Pending" msgstr "保留" @@ -117,44 +117,44 @@ msgstr "保留" msgid "Upload cancelled." msgstr "アップロードはキャンセルされました。" -#: js/files.js:423 +#: js/files.js:424 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。" -#: js/files.js:493 +#: js/files.js:494 msgid "Invalid name, '/' is not allowed." msgstr "無効な名前、'/' は使用できません。" -#: js/files.js:666 +#: js/files.js:667 msgid "files scanned" -msgstr "" +msgstr "ファイルをスキャンしました" -#: js/files.js:674 +#: js/files.js:675 msgid "error while scanning" -msgstr "" +msgstr "スキャン中のエラー" -#: js/files.js:748 templates/index.php:56 +#: js/files.js:749 templates/index.php:56 msgid "Size" msgstr "サイズ" -#: js/files.js:749 templates/index.php:58 +#: js/files.js:750 templates/index.php:58 msgid "Modified" msgstr "更新日時" -#: js/files.js:776 +#: js/files.js:777 msgid "folder" msgstr "フォルダ" -#: js/files.js:778 +#: js/files.js:779 msgid "folders" msgstr "フォルダ" -#: js/files.js:786 +#: js/files.js:787 msgid "file" msgstr "ファイル" -#: js/files.js:788 +#: js/files.js:789 msgid "files" msgstr "ファイル" diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po index 2923fe476f9..b68d6c033b4 100644 --- a/l10n/ja_JP/files_versions.po +++ b/l10n/ja_JP/files_versions.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-17 02:02+0200\n" -"PO-Revision-Date: 2012-09-17 00:04+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 01:06+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,8 +32,8 @@ msgstr "これは、あなたのファイルのすべてのバックアップバ #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "ファイルのバージョン管理" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "有効化" diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po index 0a0ccd1a44f..073691da01e 100644 --- a/l10n/ja_JP/settings.po +++ b/l10n/ja_JP/settings.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 01:05+0000\n" +"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -113,7 +113,7 @@ msgstr "cron(自動定期実行)" #: templates/admin.php:37 msgid "Execute one task with each page loaded" -msgstr "" +msgstr "各ページの読み込み時にタスクを1つ実行する" #: templates/admin.php:43 msgid "" @@ -125,11 +125,11 @@ msgstr "cron.php は webcron サービスとして登録されています。HTT msgid "" "Use systems cron service. Call the cron.php file in the owncloud folder via " "a system cronjob once a minute." -msgstr "" +msgstr "システムのcronサービスを利用する。1分に1回の頻度でシステムのcronジョブによりowncloudフォルダ内のcron.phpファイルを呼び出してください。" #: templates/admin.php:56 msgid "Sharing" -msgstr "" +msgstr "共有中" #: templates/admin.php:61 msgid "Enable Share API" @@ -224,7 +224,7 @@ msgstr "解答" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "現在､<strong>%s</strong> / <strong>%s<strong> を利用しています" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -236,7 +236,7 @@ msgstr "ダウンロード" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "パスワードを変更しました" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 114d6039840..b1e94660893 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/settings.po @@ -4,6 +4,7 @@ # # Translators: # <bart.formosus@gmail.com>, 2011. +# <bramdv@me.com>, 2012. # <didi.debian@cknow.org>, 2012. # Erik Bent <hj.bent.60@gmail.com>, 2012. # <icewind1991@gmail.com>, 2011, 2012. @@ -15,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 11:36+0000\n" +"Last-Translator: Bramdv <bramdv@me.com>\n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -135,7 +136,7 @@ msgstr "" #: templates/admin.php:56 msgid "Sharing" -msgstr "" +msgstr "Delen" #: templates/admin.php:61 msgid "Enable Share API" @@ -230,7 +231,7 @@ msgstr "Beantwoord" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -242,7 +243,7 @@ msgstr "Download" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Je wachtwoord is veranderd" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po index 852ced02fdc..11a61701141 100644 --- a/l10n/ru_RU/files_encryption.po +++ b/l10n/ru_RU/files_encryption.po @@ -3,32 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <cdewqazxsqwe@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-30 02:02+0200\n" -"PO-Revision-Date: 2012-08-12 22:33+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 12:14+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:3 msgid "Encryption" -msgstr "" +msgstr "Шифрование" #: templates/settings.php:4 msgid "Exclude the following file types from encryption" -msgstr "" +msgstr "Исключите следующие типы файлов из шифрования" #: templates/settings.php:5 msgid "None" -msgstr "" +msgstr "Ни один" #: templates/settings.php:10 msgid "Enable Encryption" -msgstr "" +msgstr "Включить шифрование" diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po index 8d869422275..225f0f78ffc 100644 --- a/l10n/ru_RU/files_external.po +++ b/l10n/ru_RU/files_external.po @@ -3,80 +3,81 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <cdewqazxsqwe@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-30 02:02+0200\n" -"PO-Revision-Date: 2012-08-12 22:34+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 13:11+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:3 msgid "External Storage" -msgstr "" +msgstr "Внешние системы хранения данных" #: templates/settings.php:7 templates/settings.php:19 msgid "Mount point" -msgstr "" +msgstr "Точка монтирования" #: templates/settings.php:8 msgid "Backend" -msgstr "" +msgstr "Бэкэнд" #: templates/settings.php:9 msgid "Configuration" -msgstr "" +msgstr "Конфигурация" #: templates/settings.php:10 msgid "Options" -msgstr "" +msgstr "Опции" #: templates/settings.php:11 msgid "Applicable" -msgstr "" +msgstr "Применимый" #: templates/settings.php:23 msgid "Add mount point" -msgstr "" +msgstr "Добавить точку монтирования" #: templates/settings.php:54 templates/settings.php:62 msgid "None set" -msgstr "" +msgstr "Не задан" #: templates/settings.php:63 msgid "All Users" -msgstr "" +msgstr "Все пользователи" #: templates/settings.php:64 msgid "Groups" -msgstr "" +msgstr "Группы" #: templates/settings.php:69 msgid "Users" -msgstr "" +msgstr "Пользователи" #: templates/settings.php:77 templates/settings.php:96 msgid "Delete" -msgstr "" +msgstr "Удалить" #: templates/settings.php:88 msgid "SSL root certificates" -msgstr "" +msgstr "Корневые сертификаты SSL" #: templates/settings.php:102 msgid "Import Root Certificate" -msgstr "" +msgstr "Импортировать корневые сертификаты" #: templates/settings.php:108 msgid "Enable User External Storage" -msgstr "" +msgstr "Включить пользовательскую внешнюю систему хранения данных" #: templates/settings.php:109 msgid "Allow users to mount their own external storage" -msgstr "" +msgstr "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных" diff --git a/l10n/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po index 5a793d15d3d..c10bd30e36a 100644 --- a/l10n/ru_RU/files_sharing.po +++ b/l10n/ru_RU/files_sharing.po @@ -3,36 +3,37 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <cdewqazxsqwe@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-31 02:02+0200\n" -"PO-Revision-Date: 2012-08-31 00:04+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 13:09+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "Пароль" #: templates/authenticate.php:6 msgid "Submit" -msgstr "" +msgstr "Передать" -#: templates/public.php:9 templates/public.php:19 +#: templates/public.php:10 templates/public.php:26 msgid "Download" -msgstr "" +msgstr "Загрузка" -#: templates/public.php:18 +#: templates/public.php:25 msgid "No preview available for" -msgstr "" +msgstr "Предварительный просмотр недоступен" -#: templates/public.php:23 +#: templates/public.php:33 msgid "web services under your control" -msgstr "" +msgstr "веб-сервисы под Вашим контролем" diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po index d48bed5764d..0c77ce79e79 100644 --- a/l10n/ru_RU/files_versions.po +++ b/l10n/ru_RU/files_versions.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <cdewqazxsqwe@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-17 02:02+0200\n" -"PO-Revision-Date: 2012-09-17 00:04+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 13:51+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,16 +24,16 @@ msgstr "" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "Версии" #: templates/settings-personal.php:7 msgid "This will delete all existing backup versions of your files" -msgstr "" +msgstr "Это приведет к удалению всех существующих версий резервной копии ваших файлов" #: templates/settings.php:3 msgid "Files Versioning" -msgstr "" +msgstr "Файлы управления версиями" #: templates/settings.php:4 msgid "Enable" -msgstr "" +msgstr "Включить" diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po index 9b7bced5422..006bcb62b0f 100644 --- a/l10n/ru_RU/lib.po +++ b/l10n/ru_RU/lib.po @@ -3,43 +3,44 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <cdewqazxsqwe@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-01 02:01+0200\n" -"PO-Revision-Date: 2012-09-01 00:02+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 12:09+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: app.php:288 +#: app.php:285 msgid "Help" -msgstr "" +msgstr "Помощь" -#: app.php:295 +#: app.php:292 msgid "Personal" -msgstr "" +msgstr "Персональный" -#: app.php:300 +#: app.php:297 msgid "Settings" -msgstr "" +msgstr "Настройки" -#: app.php:305 +#: app.php:302 msgid "Users" -msgstr "" +msgstr "Пользователи" -#: app.php:312 +#: app.php:309 msgid "Apps" -msgstr "" +msgstr "Приложения" -#: app.php:314 +#: app.php:311 msgid "Admin" -msgstr "" +msgstr "Админ" #: files.php:280 msgid "ZIP download is turned off." @@ -47,79 +48,79 @@ msgstr "" #: files.php:281 msgid "Files need to be downloaded one by one." -msgstr "" +msgstr "Файлы должны быть загружены один за другим." #: files.php:281 files.php:306 msgid "Back to Files" -msgstr "" +msgstr "Обратно к файлам" #: files.php:305 msgid "Selected files too large to generate zip file." -msgstr "" +msgstr "Выбранные файлы слишком велики для генерации zip-архива." #: json.php:28 msgid "Application is not enabled" -msgstr "" +msgstr "Приложение не запущено" #: json.php:39 json.php:63 json.php:75 msgid "Authentication error" -msgstr "" +msgstr "Ошибка аутентификации" #: json.php:51 msgid "Token expired. Please reload page." -msgstr "" +msgstr "Маркер истек. Пожалуйста, перезагрузите страницу." -#: template.php:86 +#: template.php:87 msgid "seconds ago" -msgstr "" +msgstr "секунд назад" -#: template.php:87 +#: template.php:88 msgid "1 minute ago" -msgstr "" +msgstr "1 минуту назад" -#: template.php:88 +#: template.php:89 #, php-format msgid "%d minutes ago" -msgstr "" +msgstr "%d минут назад" -#: template.php:91 +#: template.php:92 msgid "today" -msgstr "" +msgstr "сегодня" -#: template.php:92 +#: template.php:93 msgid "yesterday" -msgstr "" +msgstr "вчера" -#: template.php:93 +#: template.php:94 #, php-format msgid "%d days ago" -msgstr "" +msgstr "%d дней назад" -#: template.php:94 +#: template.php:95 msgid "last month" -msgstr "" +msgstr "в прошлом месяце" -#: template.php:95 +#: template.php:96 msgid "months ago" -msgstr "" +msgstr "месяц назад" -#: template.php:96 +#: template.php:97 msgid "last year" -msgstr "" +msgstr "в прошлом году" -#: template.php:97 +#: template.php:98 msgid "years ago" -msgstr "" +msgstr "год назад" #: updater.php:66 #, php-format msgid "%s is available. Get <a href=\"%s\">more information</a>" -msgstr "" +msgstr "%s доступно. Получите <a href=\"%s\">more information</a>" #: updater.php:68 msgid "up to date" -msgstr "" +msgstr "до настоящего времени" #: updater.php:71 msgid "updates check is disabled" -msgstr "" +msgstr "Проверка обновлений отключена" diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po index 13c174b7807..d021721a7d3 100644 --- a/l10n/ru_RU/user_ldap.po +++ b/l10n/ru_RU/user_ldap.po @@ -3,23 +3,24 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <cdewqazxsqwe@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-30 02:02+0200\n" -"PO-Revision-Date: 2012-08-12 22:45+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" +"PO-Revision-Date: 2012-09-20 13:17+0000\n" +"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru_RU\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: templates/settings.php:8 msgid "Host" -msgstr "" +msgstr "Хост" #: templates/settings.php:8 msgid "" @@ -28,7 +29,7 @@ msgstr "" #: templates/settings.php:9 msgid "Base DN" -msgstr "" +msgstr "База DN" #: templates/settings.php:9 msgid "You can specify Base DN for users and groups in the Advanced tab" @@ -36,7 +37,7 @@ msgstr "" #: templates/settings.php:10 msgid "User DN" -msgstr "" +msgstr "DN пользователя" #: templates/settings.php:10 msgid "" @@ -47,11 +48,11 @@ msgstr "" #: templates/settings.php:11 msgid "Password" -msgstr "" +msgstr "Пароль" #: templates/settings.php:11 msgid "For anonymous access, leave DN and Password empty." -msgstr "" +msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми." #: templates/settings.php:12 msgid "User Login Filter" @@ -83,7 +84,7 @@ msgstr "" #: templates/settings.php:14 msgid "Group Filter" -msgstr "" +msgstr "Групповой фильтр" #: templates/settings.php:14 msgid "Defines the filter to apply, when retrieving groups." @@ -95,7 +96,7 @@ msgstr "" #: templates/settings.php:17 msgid "Port" -msgstr "" +msgstr "Порт" #: templates/settings.php:18 msgid "Base User Tree" @@ -111,11 +112,11 @@ msgstr "" #: templates/settings.php:21 msgid "Use TLS" -msgstr "" +msgstr "Использовать TLS" #: templates/settings.php:21 msgid "Do not use it for SSL connections, it will fail." -msgstr "" +msgstr "Не используйте это SSL-соединений, это не будет выполнено." #: templates/settings.php:22 msgid "Case insensitve LDAP server (Windows)" @@ -123,7 +124,7 @@ msgstr "" #: templates/settings.php:23 msgid "Turn off SSL certificate validation." -msgstr "" +msgstr "Выключить проверку сертификата SSL." #: templates/settings.php:23 msgid "" @@ -153,7 +154,7 @@ msgstr "" #: templates/settings.php:27 msgid "in bytes" -msgstr "" +msgstr "в байтах" #: templates/settings.php:29 msgid "in seconds. A change empties the cache." @@ -163,8 +164,8 @@ msgstr "" msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." -msgstr "" +msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут." #: templates/settings.php:32 msgid "Help" -msgstr "" +msgstr "Помощь" diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po index 74bcf6521e2..5cdb2f9b2eb 100644 --- a/l10n/sv/settings.po +++ b/l10n/sv/settings.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 05:59+0000\n" +"Last-Translator: Magnus Höglund <magnus@linux.com>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -229,7 +229,7 @@ msgstr "Svar" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "Du har använt <strong>%s</strong> av tillgängliga <strong>%s<strong>" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -241,7 +241,7 @@ msgstr "Ladda ner" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "Ditt lösenord har ändrats" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index a6038745f24..3da643204cc 100644 --- a/l10n/templates/core.pot +++ b/l10n/templates/core.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 64338b89900..5988309ac79 100644 --- a/l10n/templates/files.pot +++ b/l10n/templates/files.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -59,39 +59,39 @@ msgstr "" msgid "Delete" msgstr "" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "already exists" msgstr "" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "replace" msgstr "" -#: js/filelist.js:186 +#: js/filelist.js:188 msgid "suggest name" msgstr "" -#: js/filelist.js:186 js/filelist.js:188 +#: js/filelist.js:188 js/filelist.js:190 msgid "cancel" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 +#: js/filelist.js:237 js/filelist.js:239 msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:267 js/filelist.js:269 +#: js/filelist.js:237 js/filelist.js:239 js/filelist.js:271 js/filelist.js:273 msgid "undo" msgstr "" -#: js/filelist.js:237 +#: js/filelist.js:239 msgid "with" msgstr "" -#: js/filelist.js:267 +#: js/filelist.js:271 msgid "unshared" msgstr "" -#: js/filelist.js:269 +#: js/filelist.js:273 msgid "deleted" msgstr "" @@ -107,7 +107,7 @@ msgstr "" msgid "Upload Error" msgstr "" -#: js/files.js:236 js/files.js:341 js/files.js:370 +#: js/files.js:236 js/files.js:341 js/files.js:371 msgid "Pending" msgstr "" @@ -115,44 +115,44 @@ msgstr "" msgid "Upload cancelled." msgstr "" -#: js/files.js:423 +#: js/files.js:424 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." msgstr "" -#: js/files.js:493 +#: js/files.js:494 msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:666 +#: js/files.js:667 msgid "files scanned" msgstr "" -#: js/files.js:674 +#: js/files.js:675 msgid "error while scanning" msgstr "" -#: js/files.js:748 templates/index.php:56 +#: js/files.js:749 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:749 templates/index.php:58 +#: js/files.js:750 templates/index.php:58 msgid "Modified" msgstr "" -#: js/files.js:776 +#: js/files.js:777 msgid "folder" msgstr "" -#: js/files.js:778 +#: js/files.js:779 msgid "folders" msgstr "" -#: js/files.js:786 +#: js/files.js:787 msgid "file" msgstr "" -#: js/files.js:788 +#: js/files.js:789 msgid "files" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index eff89723f52..daeb636e2e8 100644 --- a/l10n/templates/files_encryption.pot +++ b/l10n/templates/files_encryption.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 6620d3bc646..47e75c8fd4e 100644 --- a/l10n/templates/files_external.pot +++ b/l10n/templates/files_external.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index ad9c4baa806..38e3593cbc7 100644 --- a/l10n/templates/files_sharing.pot +++ b/l10n/templates/files_sharing.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -25,14 +25,14 @@ msgstr "" msgid "Submit" msgstr "" -#: templates/public.php:9 templates/public.php:19 +#: templates/public.php:10 templates/public.php:26 msgid "Download" msgstr "" -#: templates/public.php:18 +#: templates/public.php:25 msgid "No preview available for" msgstr "" -#: templates/public.php:25 +#: templates/public.php:33 msgid "web services under your control" msgstr "" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 1b030794489..fcea4a7c6a0 100644 --- a/l10n/templates/files_versions.pot +++ b/l10n/templates/files_versions.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index c401f537f8d..8afa66abbda 100644 --- a/l10n/templates/lib.pot +++ b/l10n/templates/lib.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index bc38b16ffc4..80c99fad1cc 100644 --- a/l10n/templates/settings.pot +++ b/l10n/templates/settings.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index d0735f90586..0450ef1b723 100644 --- a/l10n/templates/user_ldap.pot +++ b/l10n/templates/user_ldap.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" +"POT-Creation-Date: 2012-09-21 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po index afcca136a2f..f892ef3aebc 100644 --- a/l10n/th_TH/settings.po +++ b/l10n/th_TH/settings.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-19 02:02+0200\n" -"PO-Revision-Date: 2012-09-19 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 17:08+0000\n" +"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n" "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -225,7 +225,7 @@ msgstr "คำตอบ" #: templates/personal.php:8 #, php-format msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>" -msgstr "" +msgstr "คุณได้ใช้ <strong>%s</strong> จากที่สามารถใช้ได้ <strong>%s<strong>" #: templates/personal.php:12 msgid "Desktop and Mobile Syncing Clients" @@ -237,7 +237,7 @@ msgstr "ดาวน์โหลด" #: templates/personal.php:19 msgid "Your password was changed" -msgstr "" +msgstr "รหัสผ่านของคุณถูกเปลี่ยนแล้ว" #: templates/personal.php:20 msgid "Unable to change your password" diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po index a34796c9c3d..e59cc26498e 100644 --- a/l10n/zh_CN/user_ldap.po +++ b/l10n/zh_CN/user_ldap.po @@ -3,23 +3,24 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# <appweb.cn@gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-29 02:01+0200\n" -"PO-Revision-Date: 2012-08-29 00:03+0000\n" -"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n" +"POT-Creation-Date: 2012-09-20 02:05+0200\n" +"PO-Revision-Date: 2012-09-19 12:44+0000\n" +"Last-Translator: hanfeng <appweb.cn@gmail.com>\n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 msgid "Host" -msgstr "" +msgstr "主机" #: templates/settings.php:8 msgid "" @@ -28,15 +29,15 @@ msgstr "" #: templates/settings.php:9 msgid "Base DN" -msgstr "" +msgstr "Base DN" #: templates/settings.php:9 msgid "You can specify Base DN for users and groups in the Advanced tab" -msgstr "" +msgstr "您可以在高级选项卡里为用户和组指定Base DN" #: templates/settings.php:10 msgid "User DN" -msgstr "" +msgstr "User DN" #: templates/settings.php:10 msgid "" @@ -47,7 +48,7 @@ msgstr "" #: templates/settings.php:11 msgid "Password" -msgstr "" +msgstr "密码" #: templates/settings.php:11 msgid "For anonymous access, leave DN and Password empty." @@ -95,7 +96,7 @@ msgstr "" #: templates/settings.php:17 msgid "Port" -msgstr "" +msgstr "端口" #: templates/settings.php:18 msgid "Base User Tree" @@ -167,4 +168,4 @@ msgstr "" #: templates/settings.php:32 msgid "Help" -msgstr "" +msgstr "帮助" diff --git a/lib/app.php b/lib/app.php index 38ba4bcdc88..288f82d054b 100755 --- a/lib/app.php +++ b/lib/app.php @@ -532,7 +532,10 @@ class OC_App{ $apps=array(); foreach ( OC::$APPSROOTS as $apps_dir ) { - + if(! is_readable($apps_dir['path'])) { + OC_Log::write('core', 'unable to read app folder : ' .$apps_dir['path'] , OC_Log::WARN); + continue; + } $dh = opendir( $apps_dir['path'] ); while( $file = readdir( $dh ) ) { @@ -619,7 +622,13 @@ class OC_App{ $installedVersion = $versions[$app]; if (version_compare($currentVersion, $installedVersion, '>')) { OC_Log::write($app, 'starting app upgrade from '.$installedVersion.' to '.$currentVersion, OC_Log::DEBUG); - OC_App::updateApp($app); + try { + OC_App::updateApp($app); + } + catch (Exception $e) { + echo 'Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"'; + die; + } OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app)); } } diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php index bbc615c0b16..413efef73b7 100644 --- a/lib/connector/sabre/directory.php +++ b/lib/connector/sabre/directory.php @@ -93,10 +93,12 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa $path = $this->path . '/' . $name; if (is_null($info)) { - $info = OC_FileCache::get($path); + $info = OC_Files::getFileInfo($path); } - if (!$info) throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located'); + if (!$info) { + throw new Sabre_DAV_Exception_NotFound('File with name ' . $path . ' could not be located'); + } if ($info['mimetype'] == 'httpd/unix-directory') { $node = new OC_Connector_Sabre_Directory($path); @@ -115,7 +117,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa */ public function getChildren() { - $folder_content = OC_FileCache::getFolderContent($this->path); + $folder_content = OC_Files::getDirectoryContent($this->path); $paths = array(); foreach($folder_content as $info) { $paths[] = $this->path.'/'.$info['name']; diff --git a/lib/db.php b/lib/db.php index 9c10512350f..1f0593b0804 100644 --- a/lib/db.php +++ b/lib/db.php @@ -226,6 +226,7 @@ class OC_DB { 'phptype' => 'oci8', 'username' => $user, 'password' => $pass, + 'charset' => 'AL32UTF8', ); if ($host != '') { $dsn['hostspec'] = $host; diff --git a/lib/filecache.php b/lib/filecache.php index adcf97753ed..07099bcccd5 100644 --- a/lib/filecache.php +++ b/lib/filecache.php @@ -481,7 +481,7 @@ class OC_FileCache{ */ public static function clear($user='') { if($user) { - $query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE user=?'); + $query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE `user`=?'); $query->execute(array($user)); }else{ $query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache`'); diff --git a/lib/files.php b/lib/files.php index 63dd96b9509..360614caec9 100644 --- a/lib/files.php +++ b/lib/files.php @@ -29,6 +29,35 @@ class OC_Files { static $tmpFiles=array(); /** + * get the filesystem info + * @param string path + * @return array + * + * returns an associative array with the following keys: + * - size + * - mtime + * - ctime + * - mimetype + * - encrypted + * - versioned + */ + public static function getFileInfo($path) { + if (($path == '/Shared' || substr($path, 0, 8) == '/Shared/') && OC_App::isEnabled('files_sharing')) { + if ($path == '/Shared') { + $info = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_File::FORMAT_FILE_APP_ROOT); + } + else { + $info = OCP\Share::getItemSharedWith('file', '/'.$name, OC_Share_Backend_File::FORMAT_FILE_APP); + } + $info = $info[0]; + } + else { + $info = OC_FileCache::get($path); + } + return $info; + } + + /** * get the content of a directory * @param dir $directory path under datadirectory */ diff --git a/lib/filesystem.php b/lib/filesystem.php index ce4d3a0cf48..f5c10923b32 100644 --- a/lib/filesystem.php +++ b/lib/filesystem.php @@ -357,7 +357,7 @@ class OC_Filesystem{ * @return string */ static public function getLocalPath($path) { - $datadir = OC_User::getHome($user).'/files'; + $datadir = OC_User::getHome(OC_User::getUser()).'/files'; $newpath = $path; if (strncmp($newpath, $datadir, strlen($datadir)) == 0) { $newpath = substr($path, strlen($datadir)); diff --git a/lib/l10n/el.php b/lib/l10n/el.php index d9f272258e1..e4e12490711 100644 --- a/lib/l10n/el.php +++ b/lib/l10n/el.php @@ -11,7 +11,7 @@ "Selected files too large to generate zip file." => "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip.", "Application is not enabled" => "Δεν ενεργοποιήθηκε η εφαρμογή", "Authentication error" => "Σφάλμα πιστοποίησης", -"Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ επανα-φορτώστε την σελίδα.", +"Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα.", "seconds ago" => "δευτερόλεπτα πριν", "1 minute ago" => "1 λεπτό πριν", "%d minutes ago" => "%d λεπτά πριν", @@ -21,5 +21,8 @@ "last month" => "τον προηγούμενο μήνα", "months ago" => "μήνες πριν", "last year" => "τον προηγούμενο χρόνο", -"years ago" => "χρόνια πριν" +"years ago" => "χρόνια πριν", +"%s is available. Get <a href=\"%s\">more information</a>" => "%s είναι διαθέσιμα. Δείτε <a href=\"%s\">περισσότερες πληροφορίες</a>", +"up to date" => "ενημερωμένο", +"updates check is disabled" => "ο έλεγχος ενημερώσεων είναι απενεργοποιημένος" ); diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php new file mode 100644 index 00000000000..1e691993014 --- /dev/null +++ b/lib/l10n/ru_RU.php @@ -0,0 +1,27 @@ +<?php $TRANSLATIONS = array( +"Help" => "Помощь", +"Personal" => "Персональный", +"Settings" => "Настройки", +"Users" => "Пользователи", +"Apps" => "Приложения", +"Admin" => "Админ", +"Files need to be downloaded one by one." => "Файлы должны быть загружены один за другим.", +"Back to Files" => "Обратно к файлам", +"Selected files too large to generate zip file." => "Выбранные файлы слишком велики для генерации zip-архива.", +"Application is not enabled" => "Приложение не запущено", +"Authentication error" => "Ошибка аутентификации", +"Token expired. Please reload page." => "Маркер истек. Пожалуйста, перезагрузите страницу.", +"seconds ago" => "секунд назад", +"1 minute ago" => "1 минуту назад", +"%d minutes ago" => "%d минут назад", +"today" => "сегодня", +"yesterday" => "вчера", +"%d days ago" => "%d дней назад", +"last month" => "в прошлом месяце", +"months ago" => "месяц назад", +"last year" => "в прошлом году", +"years ago" => "год назад", +"%s is available. Get <a href=\"%s\">more information</a>" => "%s доступно. Получите <a href=\"%s\">more information</a>", +"up to date" => "до настоящего времени", +"updates check is disabled" => "Проверка обновлений отключена" +); diff --git a/lib/template.php b/lib/template.php index 8c872a2059b..76a0b372b3c 100644 --- a/lib/template.php +++ b/lib/template.php @@ -158,7 +158,8 @@ class OC_Template{ if($renderas == 'user') { $this->vars['requesttoken'] = OC_Util::callRegister(); } - $this->l10n = OC_L10N::get($app); + $parts = explode('/', $app); // fix translation when app is something like core/lostpassword + $this->l10n = OC_L10N::get($parts[0]); header('X-Frame-Options: Sameorigin'); header('X-XSS-Protection: 1; mode=block'); header('X-Content-Type-Options: nosniff'); diff --git a/lib/util.php b/lib/util.php index 5e39fd1f914..08412464254 100755 --- a/lib/util.php +++ b/lib/util.php @@ -81,7 +81,7 @@ class OC_Util { */ public static function getVersion() { // hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user - return array(4,84,7); + return array(4,84,10); } /** @@ -89,7 +89,7 @@ class OC_Util { * @return string */ public static function getVersionString() { - return '4.5 beta 3a'; + return '4.5 beta 4'; } /** diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php index 5b42161b548..bc64b68992b 100644 --- a/settings/l10n/cs_CZ.php +++ b/settings/l10n/cs_CZ.php @@ -45,8 +45,10 @@ "Problems connecting to help database." => "Problémy s připojením k databázi s nápovědou.", "Go there manually." => "Přejít ručně.", "Answer" => "Odpověď", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Použili jste <strong>%s</strong> z dostupných <strong>%s<strong>", "Desktop and Mobile Syncing Clients" => "Klienti pro synchronizaci", "Download" => "Stáhnout", +"Your password was changed" => "Vaše heslo bylo změněno", "Unable to change your password" => "Vaše heslo nelze změnit", "Current password" => "Současné heslo", "New password" => "Nové heslo", diff --git a/settings/l10n/de.php b/settings/l10n/de.php index 8c6d5ab0b0f..12b1652ce88 100644 --- a/settings/l10n/de.php +++ b/settings/l10n/de.php @@ -45,8 +45,10 @@ "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.", "Go there manually." => "Datenbank direkt besuchen.", "Answer" => "Antwort", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s<strong>", "Desktop and Mobile Syncing Clients" => "Desktop- und mobile Clients für die Synchronisation", "Download" => "Download", +"Your password was changed" => "Ihr Passwort wurde geändert.", "Unable to change your password" => "Passwort konnte nicht geändert werden", "Current password" => "Aktuelles Passwort", "New password" => "Neues Passwort", diff --git a/settings/l10n/el.php b/settings/l10n/el.php index 15f89c84cfb..c6bb9857100 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -45,21 +45,23 @@ "Problems connecting to help database." => "Προβλήματα κατά τη σύνδεση με τη βάση δεδομένων βοήθειας.", "Go there manually." => "Χειροκίνητη μετάβαση.", "Answer" => "Απάντηση", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Έχετε χρησιμοποιήσει <strong>%s</strong> από τα διαθέσιμα <strong>%s<strong>", "Desktop and Mobile Syncing Clients" => "Πελάτες συγχρονισμού για Desktop και Mobile", -"Download" => "Κατέβασε", +"Download" => "Λήψη", +"Your password was changed" => "Το συνθηματικό σας έχει αλλάξει", "Unable to change your password" => "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης", -"Current password" => "Τρέχων κωδικός πρόσβασης", -"New password" => "Νέος κωδικός", +"Current password" => "Τρέχων συνθηματικό", +"New password" => "Νέο συνθηματικό", "show" => "εμφάνιση", -"Change password" => "Αλλαγή κωδικού πρόσβασης", +"Change password" => "Αλλαγή συνθηματικού", "Email" => "Email", "Your email address" => "Διεύθυνση ηλεκτρονικού ταχυδρομείου σας", -"Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση κωδικού πρόσβασης", +"Fill in an email address to enable password recovery" => "Συμπληρώστε μια διεύθυνση ηλεκτρονικού ταχυδρομείου για να ενεργοποιηθεί η ανάκτηση συνθηματικού", "Language" => "Γλώσσα", "Help translate" => "Βοηθήστε στην μετάφραση", "use this address to connect to your ownCloud in your file manager" => "χρησιμοποιήστε αυτή τη διεύθυνση για να συνδεθείτε στο ownCloud σας από το διαχειριστή αρχείων σας", "Name" => "Όνομα", -"Password" => "Κωδικός", +"Password" => "Συνθηματικό", "Groups" => "Ομάδες", "Create" => "Δημιουργία", "Default Quota" => "Προεπιλεγμένο όριο", diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php index 29633cc4b93..4320b8ae693 100644 --- a/settings/l10n/eu.php +++ b/settings/l10n/eu.php @@ -20,7 +20,10 @@ "Security Warning" => "Segurtasun abisua", "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." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.", "Cron" => "Cron", +"Execute one task with each page loaded" => "Exekutatu zeregin bat orri karga bakoitzean", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php webcron zerbitzu batean erregistratua dago. Deitu cron.php orria ownclouden erroan minuturo http bidez.", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Erabili sistemaren cron zerbitzua. Deitu cron.php fitxategia owncloud karpetan minuturo sistemaren cron lan baten bidez.", +"Sharing" => "Partekatzea", "Enable Share API" => "Gaitu Partekatze APIa", "Allow apps to use the Share API" => "Baimendu aplikazioak Partekatze APIa erabiltzeko", "Allow links" => "Baimendu loturak", @@ -42,8 +45,10 @@ "Problems connecting to help database." => "Arazoak daude laguntza datubasera konektatzeko.", "Go there manually." => "Joan hara eskuz.", "Answer" => "Erantzun", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Eskuragarri dituzun <strong>%s</strong>etik <strong>%s</strong> erabili duzu", "Desktop and Mobile Syncing Clients" => "Mahaigain eta mugikorren sinkronizazio bezeroak", "Download" => "Deskargatu", +"Your password was changed" => "Zere pasahitza aldatu da", "Unable to change your password" => "Ezin izan da zure pasahitza aldatu", "Current password" => "Uneko pasahitza", "New password" => "Pasahitz berria", diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php index 0a313738da3..0969b6e3654 100644 --- a/settings/l10n/fi_FI.php +++ b/settings/l10n/fi_FI.php @@ -42,8 +42,10 @@ "Problems connecting to help database." => "Virhe yhdistettäessä tietokantaan.", "Go there manually." => "Ohje löytyy sieltä.", "Answer" => "Vastaus", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s<strong>", "Desktop and Mobile Syncing Clients" => "Tietokoneen ja mobiililaitteiden synkronointisovellukset", "Download" => "Lataa", +"Your password was changed" => "Salasanasi vaihdettiin", "Unable to change your password" => "Salasanaasi ei voitu vaihtaa", "Current password" => "Nykyinen salasana", "New password" => "Uusi salasana", diff --git a/settings/l10n/it.php b/settings/l10n/it.php index 013ef8404b8..474149c836c 100644 --- a/settings/l10n/it.php +++ b/settings/l10n/it.php @@ -45,8 +45,10 @@ "Problems connecting to help database." => "Problemi di connessione al database di supporto.", "Go there manually." => "Raggiungilo manualmente.", "Answer" => "Risposta", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s<strong> disponibili", "Desktop and Mobile Syncing Clients" => "Client di sincronizzazione desktop e mobile", "Download" => "Scaricamento", +"Your password was changed" => "La tua password è cambiata", "Unable to change your password" => "Modifica password non riuscita", "Current password" => "Password attuale", "New password" => "Nuova password", diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php index 49ed57f4a9a..72f79837d90 100644 --- a/settings/l10n/ja_JP.php +++ b/settings/l10n/ja_JP.php @@ -20,7 +20,10 @@ "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." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。", "Cron" => "cron(自動定期実行)", +"Execute one task with each page loaded" => "各ページの読み込み時にタスクを1つ実行する", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php は webcron サービスとして登録されています。HTTP経由で1分間に1回の頻度で owncloud のルートページ内の cron.php ページを呼び出します。", +"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "システムのcronサービスを利用する。1分に1回の頻度でシステムのcronジョブによりowncloudフォルダ内のcron.phpファイルを呼び出してください。", +"Sharing" => "共有中", "Enable Share API" => "Share APIを有効", "Allow apps to use the Share API" => "Share APIの使用をアプリケーションに許可", "Allow links" => "リンクを許可", @@ -42,8 +45,10 @@ "Problems connecting to help database." => "ヘルプデータベースへの接続時に問題が発生しました", "Go there manually." => "手動で移動してください。", "Answer" => "解答", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "現在､<strong>%s</strong> / <strong>%s<strong> を利用しています", "Desktop and Mobile Syncing Clients" => "デスクトップおよびモバイル用の同期クライアント", "Download" => "ダウンロード", +"Your password was changed" => "パスワードを変更しました", "Unable to change your password" => "パスワードを変更することができません", "Current password" => "現在のパスワード", "New password" => "新しいパスワード", diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index c80c3a53c2f..e28adf88345 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -21,6 +21,7 @@ "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 folder en uw bestanden zijn hoogst waarschijnlijk vanaf het internet bereikbaar. Het .htaccess bestand dat ownCloud meelevert werkt niet. Het is ten zeerste aangeraden om uw webserver zodanig te configureren, dat de data folder niet bereikbaar is vanaf het internet of verplaatst uw data folder naar een locatie buiten de webserver document root.", "Cron" => "Cron", "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php is bij een webcron dienst geregistreerd. Roep de cron.php pagina in de owncloud root via http één maal per minuut op.", +"Sharing" => "Delen", "Enable Share API" => "Zet de Deel API aan", "Allow apps to use the Share API" => "Sta apps toe om de Deel API te gebruiken", "Allow links" => "Sta links toe", @@ -42,8 +43,10 @@ "Problems connecting to help database." => "Problemen bij het verbinden met de helpdatabank.", "Go there manually." => "Ga er zelf heen.", "Answer" => "Beantwoord", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Je hebt <strong>%s</strong> gebruikt van de beschikbare <strong>%s<strong>", "Desktop and Mobile Syncing Clients" => "Desktop en mobiele synchronisatie apparaten", "Download" => "Download", +"Your password was changed" => "Je wachtwoord is veranderd", "Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen", "Current password" => "Huidig wachtwoord", "New password" => "Nieuw wachtwoord", diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php index 41fefe96f79..8e6f0dbbd7b 100644 --- a/settings/l10n/sv.php +++ b/settings/l10n/sv.php @@ -45,8 +45,10 @@ "Problems connecting to help database." => "Problem med att ansluta till hjälpdatabasen.", "Go there manually." => "Gå dit manuellt.", "Answer" => "Svar", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s<strong>", "Desktop and Mobile Syncing Clients" => "Synkroniseringsklienter för dator och mobil", "Download" => "Ladda ner", +"Your password was changed" => "Ditt lösenord har ändrats", "Unable to change your password" => "Kunde inte ändra ditt lösenord", "Current password" => "Nuvarande lösenord", "New password" => "Nytt lösenord", diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php index 80877fc5022..c3ed4e859fc 100644 --- a/settings/l10n/th_TH.php +++ b/settings/l10n/th_TH.php @@ -45,8 +45,10 @@ "Problems connecting to help database." => "เกิดปัญหาในการเชื่อมต่อกับฐานข้อมูลช่วยเหลือ", "Go there manually." => "ไปที่นั่นด้วยตนเอง", "Answer" => "คำตอบ", +"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "คุณได้ใช้ <strong>%s</strong> จากที่สามารถใช้ได้ <strong>%s<strong>", "Desktop and Mobile Syncing Clients" => "โปรแกรมเชื่อมข้อมูลไฟล์สำหรับเครื่องเดสก์ท็อปและมือถือ", "Download" => "ดาวน์โหลด", +"Your password was changed" => "รหัสผ่านของคุณถูกเปลี่ยนแล้ว", "Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้", "Current password" => "รหัสผ่านปัจจุบัน", "New password" => "รหัสผ่านใหม่", |