From 6c29334b4888309e7b60cbdf4defdac1c47195bf Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 1 Sep 2012 18:53:48 -0400 Subject: [PATCH 001/205] Add support for share expiration --- core/ajax/share.php | 6 ++++++ core/js/share.js | 27 +++++++++++++++++++++++++++ lib/public/share.php | 29 +++++++++++++++++++++++------ 3 files changed, 56 insertions(+), 6 deletions(-) diff --git a/core/ajax/share.php b/core/ajax/share.php index debdf612c0..8c2e85523e 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -55,6 +55,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo ($return) ? OC_JSON::success() : OC_JSON::error(); } break; + case 'setExpirationDate': + if (isset($_POST['date'])) { + $return = OCP\Share::setExpirationDate($_POST['itemType'], $_POST['itemSource'], $_POST['date']); + ($return) ? OC_JSON::success() : OC_JSON::error(); + } + break; } } else if (isset($_GET['fetch'])) { switch ($_GET['fetch']) { diff --git a/core/js/share.js b/core/js/share.js index 4c164f65b2..2f3b5c2fa5 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -143,6 +143,9 @@ OC.Share={ html += ''; html += ''; } + html += '
'; + html += ''; + html += ''; html += '
'; $(html).appendTo(appendTo); // Reset item shares @@ -422,6 +425,30 @@ $(document).ready(function() { } }); + $('#expirationCheckbox').live('change', function() { + if (this.checked) { + console.log('checked'); + $('#expirationDate').before('
'); + $('#expirationDate').show(); + $('#expirationDate').datepicker({ + dateFormat : 'dd-mm-yy' + }); + } else { + console.log('unchecled'); + $('#expirationDate').hide(); + } + }); + + $('#expirationDate').live('change', function() { + var itemType = $('#dropdown').data('item-type'); + 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'); + } + }); + }); + $('#emailPrivateLink').live('submit', function() { OC.Share.emailPrivateLink(); }); diff --git a/lib/public/share.php b/lib/public/share.php index 165e3df452..a9fd23bfac 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -395,6 +395,16 @@ class Share { throw new \Exception($message); } + public static function setExpirationDate($itemType, $itemSource, $date) { + if ($item = self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) { + error_log('setting'); + $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `expiration` = ? WHERE `id` = ?'); + $query->execute(array($date, $item['id'])); + return true; + } + return false; + } + /** * @brief Get the backend class for the specified item type * @param string Item type @@ -582,23 +592,23 @@ class Share { // TODO Optimize selects if ($format == self::FORMAT_STATUSES) { if ($itemType == 'file' || $itemType == 'folder') { - $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `file_source`, `path`'; + $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `file_source`, `path`, `expiration`'; } else { - $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`'; + $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`'; } } else { if (isset($uidOwner)) { if ($itemType == 'file' || $itemType == 'folder') { - $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`'; + $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`, `expiration`'; } else { - $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`'; + $select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`, `expiration`'; } } else { if ($fileDependent) { if (($itemType == 'file' || $itemType == 'folder') && $format == \OC_Share_Backend_File::FORMAT_FILE_APP || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT) { - $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable`'; + $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `expiration`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable`'; } else { - $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`'; + $select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`'; } } else { $select = '*'; @@ -650,6 +660,13 @@ class Share { $row['path'] = substr($row['path'], $root); } } + if (isset($row['expiration'])) { + $time = new \DateTime(); + if ($row['expiration'] < date('Y-m-d H:i', $time->format('U') - $time->getOffset())) { + self::delete($row['id']); + continue; + } + } $items[$row['id']] = $row; } if (!empty($items)) { From 631df21de640183623e626409903a0a1f7b0105d Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 7 Sep 2012 16:20:13 +0200 Subject: [PATCH 002/205] Prevent loading all apps twice from overwriting the core scripts and styles --- lib/app.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/app.php b/lib/app.php index f5c328afe7..f1e4f965ef 100755 --- a/lib/app.php +++ b/lib/app.php @@ -62,7 +62,9 @@ class OC_App{ ob_end_clean(); if (!defined('DEBUG') || !DEBUG) { - if (is_null($types)) { + if (is_null($types) + && empty(OC_Util::$core_scripts) + && empty(OC_Util::$core_styles)) { OC_Util::$core_scripts = OC_Util::$scripts; OC_Util::$scripts = array(); OC_Util::$core_styles = OC_Util::$styles; From edcd29747692ff1ffbec927b9f31ac239c5e192d Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Fri, 7 Sep 2012 16:42:46 +0200 Subject: [PATCH 003/205] Move handling of core remotes to OC_TemplateLayout --- core/templates/layout.base.php | 6 ------ core/templates/layout.guest.php | 6 ------ core/templates/layout.user.php | 6 ------ lib/app.php | 5 ----- lib/templatelayout.php | 12 +++++++++++- 5 files changed, 11 insertions(+), 24 deletions(-) diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index bfd23a9ce9..c113a4db24 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -4,9 +4,6 @@ ownCloud - - - @@ -14,9 +11,6 @@ var oc_webroot = ''; var oc_appswebroots = ; - - - diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 9a5a056eb2..0d2e71c180 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -4,9 +4,6 @@ ownCloud - - - @@ -14,9 +11,6 @@ var oc_webroot = ''; var oc_appswebroots = ; - - - diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 89b8027fc0..4fa0fd0136 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -4,9 +4,6 @@ <?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?> - - - @@ -15,9 +12,6 @@ var oc_appswebroots = ; var oc_current_user = ''; - - - diff --git a/lib/app.php b/lib/app.php index f1e4f965ef..28f1f16eba 100755 --- a/lib/app.php +++ b/lib/app.php @@ -69,11 +69,6 @@ class OC_App{ OC_Util::$scripts = array(); OC_Util::$core_styles = OC_Util::$styles; OC_Util::$styles = array(); - - if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) { - OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php'); - OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php'); - } } } // return diff --git a/lib/templatelayout.php b/lib/templatelayout.php index ad013edad8..d72f5552fd 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -41,9 +41,17 @@ class OC_TemplateLayout extends OC_Template { } $this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)),false ); // Ugly unescape slashes waiting for better solution + if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) { + OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php'); + OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php'); + } + // Add the js files $jsfiles = self::findJavascriptFiles(OC_Util::$scripts); $this->assign('jsfiles', array(), false); + if (!empty(OC_Util::$core_scripts)) { + $this->append( 'jsfiles', OC_Helper::linkToRemote('core.js', false)); + } foreach($jsfiles as $info) { $root = $info[0]; $web = $info[1]; @@ -53,8 +61,10 @@ class OC_TemplateLayout extends OC_Template { // Add the css files $cssfiles = self::findStylesheetFiles(OC_Util::$styles); - $this->assign('cssfiles', array()); + if (!empty(OC_Util::$core_styles)) { + $this->append( 'cssfiles', OC_Helper::linkToRemote('core.css', false)); + } foreach($cssfiles as $info) { $root = $info[0]; $web = $info[1]; From d5d2e896220de5b11e86dcfaf5f25787b7838811 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 8 Sep 2012 02:05:41 +0200 Subject: [PATCH 004/205] [tx-robot] updated from transifex --- apps/files/l10n/fr.php | 1 + apps/files/l10n/nb_NO.php | 1 + apps/files/l10n/nl.php | 1 + apps/files/l10n/ru.php | 2 + apps/files/l10n/vi.php | 2 + apps/files_encryption/l10n/vi.php | 6 + apps/files_encryption/l10n/zh_CN.php | 1 + apps/files_external/l10n/vi.php | 18 ++ apps/files_sharing/l10n/vi.php | 7 + apps/files_versions/l10n/ru.php | 2 + apps/files_versions/l10n/vi.php | 6 + apps/user_ldap/l10n/el.php | 11 + core/l10n/ru.php | 1 + l10n/af/files.po | 38 ++-- l10n/ar/files.po | 38 ++-- l10n/ar_SA/files.po | 38 ++-- l10n/bg_BG/files.po | 38 ++-- l10n/ca/files.po | 30 ++- l10n/cs_CZ/files.po | 30 ++- l10n/da/files.po | 38 ++-- l10n/de/files.po | 30 ++- l10n/el/files.po | 38 ++-- l10n/el/user_ldap.po | 31 +-- l10n/eo/files.po | 38 ++-- l10n/es/files.po | 30 ++- l10n/et_EE/files.po | 38 ++-- l10n/eu/files.po | 38 ++-- l10n/eu/settings.po | 20 +- l10n/eu_ES/files.po | 38 ++-- l10n/fa/files.po | 38 ++-- l10n/fi/files.po | 38 ++-- l10n/fi_FI/files.po | 30 ++- l10n/fr/files.po | 40 ++-- l10n/gl/files.po | 38 ++-- l10n/he/files.po | 38 ++-- l10n/hi/files.po | 38 ++-- l10n/hr/files.po | 38 ++-- l10n/hu_HU/files.po | 38 ++-- l10n/hy/files.po | 38 ++-- l10n/ia/files.po | 38 ++-- l10n/id/files.po | 38 ++-- l10n/id_ID/files.po | 38 ++-- l10n/it/files.po | 30 ++- l10n/ja_JP/files.po | 38 ++-- l10n/ko/files.po | 38 ++-- l10n/lb/files.po | 38 ++-- l10n/lt_LT/files.po | 38 ++-- l10n/lv/files.po | 38 ++-- l10n/mk/files.po | 38 ++-- l10n/ms_MY/files.po | 38 ++-- l10n/nb_NO/files.po | 41 ++-- l10n/nl/files.po | 40 ++-- l10n/nl/settings.po | 8 +- l10n/nn_NO/files.po | 38 ++-- l10n/oc/core.po | 268 +++++++++++++++++++++++ l10n/oc/files.po | 239 ++++++++++++++++++++ l10n/oc/files_encryption.po | 34 +++ l10n/oc/files_external.po | 82 +++++++ l10n/oc/files_sharing.po | 38 ++++ l10n/oc/files_versions.po | 34 +++ l10n/oc/lib.po | 125 +++++++++++ l10n/oc/settings.po | 316 +++++++++++++++++++++++++++ l10n/oc/user_ldap.po | 170 ++++++++++++++ l10n/pl/files.po | 30 ++- l10n/pl_PL/files.po | 38 ++-- l10n/pt_BR/files.po | 38 ++-- l10n/pt_PT/files.po | 38 ++-- l10n/ro/files.po | 38 ++-- l10n/ru/core.po | 15 +- l10n/ru/files.po | 43 ++-- l10n/ru/files_versions.po | 13 +- l10n/ru/lib.po | 45 ++-- l10n/ru_RU/files.po | 38 ++-- l10n/sk_SK/files.po | 38 ++-- l10n/sl/files.po | 30 ++- l10n/so/files.po | 38 ++-- l10n/sr/files.po | 38 ++-- l10n/sr@latin/files.po | 38 ++-- l10n/sv/files.po | 30 ++- l10n/templates/core.pot | 8 +- l10n/templates/files.pot | 26 ++- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 14 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/th_TH/files.po | 30 ++- l10n/tr/files.po | 38 ++-- l10n/uk/files.po | 38 ++-- l10n/vi/files.po | 43 ++-- l10n/vi/files_encryption.po | 17 +- l10n/vi/files_external.po | 41 ++-- l10n/vi/files_sharing.po | 21 +- l10n/vi/files_versions.po | 17 +- l10n/vi/lib.po | 99 ++++----- l10n/vi/settings.po | 53 ++--- l10n/zh_CN.GB2312/files.po | 38 ++-- l10n/zh_CN/files.po | 30 ++- l10n/zh_CN/files_encryption.po | 6 +- l10n/zh_TW/files.po | 38 ++-- lib/l10n/ru.php | 2 + lib/l10n/vi.php | 28 +++ settings/l10n/eu.php | 7 + settings/l10n/nl.php | 1 + settings/l10n/vi.php | 23 ++ 107 files changed, 2958 insertions(+), 1047 deletions(-) create mode 100644 apps/files_encryption/l10n/vi.php create mode 100644 apps/files_external/l10n/vi.php create mode 100644 apps/files_sharing/l10n/vi.php create mode 100644 apps/files_versions/l10n/vi.php create mode 100644 l10n/oc/core.po create mode 100644 l10n/oc/files.po create mode 100644 l10n/oc/files_encryption.po create mode 100644 l10n/oc/files_external.po create mode 100644 l10n/oc/files_sharing.po create mode 100644 l10n/oc/files_versions.po create mode 100644 l10n/oc/lib.po create mode 100644 l10n/oc/settings.po create mode 100644 l10n/oc/user_ldap.po create mode 100644 lib/l10n/vi.php diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index 0b7d226de7..bce17be3b5 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -10,6 +10,7 @@ "Delete" => "Supprimer", "already exists" => "existe déjà", "replace" => "remplacer", +"suggest name" => "Suggérer un nom", "cancel" => "annuler", "replaced" => "remplacé", "undo" => "annuler", diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php index 4a747af2f3..6331de6d45 100644 --- a/apps/files/l10n/nb_NO.php +++ b/apps/files/l10n/nb_NO.php @@ -34,6 +34,7 @@ "Enable ZIP-download" => "Aktiver nedlasting av ZIP", "0 is unlimited" => "0 er ubegrenset", "Maximum input size for ZIP files" => "Maksimal størrelse på ZIP-filer", +"Save" => "Lagre", "New" => "Ny", "Text file" => "Tekstfil", "Folder" => "Mappe", diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 7acb15054c..515d67a76a 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -10,6 +10,7 @@ "Delete" => "Verwijder", "already exists" => "bestaat al", "replace" => "vervang", +"suggest name" => "Stel een naam voor", "cancel" => "annuleren", "replaced" => "vervangen", "undo" => "ongedaan maken", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index 6a76c25404..b013ae8985 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -10,6 +10,7 @@ "Delete" => "Удалить", "already exists" => "уже существует", "replace" => "заменить", +"suggest name" => "предложить название", "cancel" => "отмена", "replaced" => "заменён", "undo" => "отмена", @@ -35,6 +36,7 @@ "Enable ZIP-download" => "Включить ZIP-скачивание", "0 is unlimited" => "0 - без ограничений", "Maximum input size for ZIP files" => "Максимальный исходный размер для ZIP файлов", +"Save" => "Сохранить", "New" => "Новый", "Text file" => "Текстовый файл", "Folder" => "Папка", diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index c2284d5feb..876d5abe9a 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -1,4 +1,5 @@ "Không có lỗi, các tập tin đã được tải lên thành công", "Files" => "Tập tin", "Delete" => "Xóa", "Upload Error" => "Tải lên lỗi", @@ -27,5 +28,6 @@ "Share" => "Chia sẻ", "Download" => "Tải xuống", "Upload too large" => "File tải lên quá lớn", +"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang cố gắng tải lên vượt quá kích thước tối đa cho phép trên máy chủ này.", "Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ." ); diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php new file mode 100644 index 0000000000..cabf2da7dc --- /dev/null +++ b/apps/files_encryption/l10n/vi.php @@ -0,0 +1,6 @@ + "Mã hóa", +"Exclude the following file types from encryption" => "Loại trừ các loại tập tin sau đây từ mã hóa", +"None" => "none", +"Enable Encryption" => "BẬT mã hóa" +); diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php index 139ae90970..1e1247d15f 100644 --- a/apps/files_encryption/l10n/zh_CN.php +++ b/apps/files_encryption/l10n/zh_CN.php @@ -1,5 +1,6 @@ "加密", +"Exclude the following file types from encryption" => "从加密中排除列出的文件类型", "None" => "None", "Enable Encryption" => "开启加密" ); diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php new file mode 100644 index 0000000000..35312329da --- /dev/null +++ b/apps/files_external/l10n/vi.php @@ -0,0 +1,18 @@ + "Lưu trữ ngoài", +"Mount point" => "Điểm gắn", +"Backend" => "phụ trợ", +"Configuration" => "Cấu hình", +"Options" => "Tùy chọn", +"Applicable" => "Áp dụng", +"Add mount point" => "Thêm điểm lắp", +"None set" => "không", +"All Users" => "Tất cả người dùng", +"Groups" => "Nhóm", +"Users" => "Người dùng", +"Delete" => "Xóa", +"SSL root certificates" => "Chứng chỉ SSL root", +"Import Root Certificate" => "Nhập Root Certificate", +"Enable User External Storage" => "Kích hoạt tính năng lưu trữ ngoài", +"Allow users to mount their own external storage" => "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài của họ" +); diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php new file mode 100644 index 0000000000..d4faee06bf --- /dev/null +++ b/apps/files_sharing/l10n/vi.php @@ -0,0 +1,7 @@ + "Mật khẩu", +"Submit" => "Xác nhận", +"Download" => "Tải về", +"No preview available for" => "Không có xem trước cho", +"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn" +); diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php index 6a824779f3..675dd090d3 100644 --- a/apps/files_versions/l10n/ru.php +++ b/apps/files_versions/l10n/ru.php @@ -1,4 +1,6 @@ "Просрочить все версии", +"Versions" => "Версии", +"This will delete all existing backup versions of your files" => "Очистить список версий ваших файлов", "Enable Files Versioning" => "Включить ведение версий файлов" ); diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php new file mode 100644 index 0000000000..6743395481 --- /dev/null +++ b/apps/files_versions/l10n/vi.php @@ -0,0 +1,6 @@ + "Hết hạn tất cả các phiên bản", +"Versions" => "Phiên bản", +"This will delete all existing backup versions of your files" => "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có ", +"Enable Files Versioning" => "BẬT tập tin phiên bản" +); diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php index 2f3c747a67..1bb72f163a 100644 --- a/apps/user_ldap/l10n/el.php +++ b/apps/user_ldap/l10n/el.php @@ -1,6 +1,17 @@ "Base DN", +"User DN" => "User DN", "Password" => "Συνθηματικό", +"User Login Filter" => "User Login Filter", +"User List Filter" => "User List Filter", +"Group Filter" => "Group Filter", "Port" => "Θύρα", +"Base User Tree" => "Base User Tree", +"Base Group Tree" => "Base Group Tree", +"Group-Member association" => "Group-Member association", +"Use TLS" => "Χρήση TLS", +"User Display Name Field" => "User Display Name Field", +"Group Display Name Field" => "Group Display Name Field", "in bytes" => "σε bytes", "Help" => "Βοήθεια" ); diff --git a/core/l10n/ru.php b/core/l10n/ru.php index 81b579aeb0..c7ce381c05 100644 --- a/core/l10n/ru.php +++ b/core/l10n/ru.php @@ -50,6 +50,7 @@ "Database user" => "Имя пользователя для базы данных", "Database password" => "Пароль для базы данных", "Database name" => "Название базы данных", +"Database tablespace" => "Табличое пространство базы данных", "Database host" => "Хост базы данных", "Finish setup" => "Завершить установку", "web services under your control" => "Сетевые службы под твоим контролем", diff --git a/l10n/af/files.po b/l10n/af/files.po index 31f2a00b0f..6cd6b21cef 100644 --- a/l10n/af/files.po +++ b/l10n/af/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Afrikaans (http://www.transifex.com/projects/p/owncloud/language/af/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -116,11 +124,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -196,36 +204,36 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/ar/files.po b/l10n/ar/files.po index 52370a91d0..7221caf070 100644 --- a/l10n/ar/files.po +++ b/l10n/ar/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,11 @@ msgstr "" msgid "Files" msgstr "الملفات" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "محذوف" @@ -76,7 +80,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -84,7 +88,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -117,11 +125,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "حجم" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "معدل" @@ -197,36 +205,36 @@ msgstr "إرفع" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "الاسم" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "تحميل" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "حجم الترفيع أعلى من المسموح" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po index f5fadbff02..8651ddd072 100644 --- a/l10n/ar_SA/files.po +++ b/l10n/ar_SA/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Arabic (Saudi Arabia) (http://www.transifex.com/projects/p/owncloud/language/ar_SA/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -116,11 +124,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -196,36 +204,36 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po index c51de878e9..f1667a2327 100644 --- a/l10n/bg_BG/files.po +++ b/l10n/bg_BG/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "Грешка при запис на диска" msgid "Files" msgstr "Файлове" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Изтриване" @@ -77,7 +81,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -85,7 +89,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -118,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Неправилно име – \"/\" не е позволено." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Размер" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Променено" @@ -198,36 +206,36 @@ msgstr "Качване" msgid "Cancel upload" msgstr "Отказване на качването" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Няма нищо, качете нещо!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Име" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Споделяне" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Изтегляне" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Файлът е прекалено голям" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Файловете се претърсват, изчакайте." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/ca/files.po b/l10n/ca/files.po index b00e52830d..f43fdccfb5 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.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-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 06:33+0000\n" -"Last-Translator: rogerc \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +54,11 @@ msgstr "Ha fallat en escriure al disc" msgid "Files" msgstr "Fitxers" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Suprimeix" @@ -78,7 +82,7 @@ msgstr "cancel·la" msgid "replaced" msgstr "substituït" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "desfés" @@ -86,7 +90,11 @@ msgstr "desfés" msgid "with" msgstr "per" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "esborrat" @@ -123,7 +131,7 @@ msgstr "El nom no és vàlid, no es permet '/'." msgid "Size" msgstr "Mida" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Modificat" @@ -215,20 +223,20 @@ msgstr "Comparteix" msgid "Download" msgstr "Baixa" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "La pujada és massa gran" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor" -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "S'estan escanejant els fitxers, espereu" -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "Actualment escanejant" diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 855b138c2a..bbdfc08e88 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.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-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 08:41+0000\n" -"Last-Translator: Tomáš Chvátal \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \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" @@ -54,7 +54,11 @@ msgstr "Zápis na disk selhal" msgid "Files" msgstr "Soubory" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Smazat" @@ -78,7 +82,7 @@ msgstr "zrušit" msgid "replaced" msgstr "nahrazeno" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "zpět" @@ -86,7 +90,11 @@ msgstr "zpět" msgid "with" msgstr "s" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "smazáno" @@ -123,7 +131,7 @@ msgstr "Neplatný název, znak '/' není povolen" msgid "Size" msgstr "Velikost" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Změněno" @@ -215,20 +223,20 @@ msgstr "Sdílet" msgid "Download" msgstr "Stáhnout" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "Odeslaný soubor je příliš velký" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru." -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Soubory se prohledávají, prosím čekejte." -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "Aktuální prohledávání" diff --git a/l10n/da/files.po b/l10n/da/files.po index ef7718c6d0..c2e2ab70ee 100644 --- a/l10n/da/files.po +++ b/l10n/da/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,11 @@ msgstr "Fejl ved skrivning til disk." msgid "Files" msgstr "Filer" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Slet" @@ -80,7 +84,7 @@ msgstr "fortryd" msgid "replaced" msgstr "erstattet" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "fortryd" @@ -88,7 +92,11 @@ msgstr "fortryd" msgid "with" msgstr "med" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "Slettet" @@ -121,11 +129,11 @@ msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuler msgid "Invalid name, '/' is not allowed." msgstr "Ugyldigt navn, '/' er ikke tilladt." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Størrelse" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Ændret" @@ -201,36 +209,36 @@ msgstr "Upload" msgid "Cancel upload" msgstr "Fortryd upload" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Her er tomt. Upload noget!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Navn" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Del" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Download" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Upload for stor" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Filerne bliver indlæst, vent venligst." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Indlæser" diff --git a/l10n/de/files.po b/l10n/de/files.po index a06845cc3b..571a069b9c 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -18,9 +18,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 06:59+0000\n" -"Last-Translator: goeck \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -62,7 +62,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte" msgid "Files" msgstr "Dateien" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Löschen" @@ -86,7 +90,7 @@ msgstr "abbrechen" msgid "replaced" msgstr "ersetzt" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "rückgängig machen" @@ -94,7 +98,11 @@ msgstr "rückgängig machen" msgid "with" msgstr "mit" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "gelöscht" @@ -131,7 +139,7 @@ msgstr "Ungültiger Name: \"/\" ist nicht erlaubt." msgid "Size" msgstr "Größe" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Bearbeitet" @@ -223,20 +231,20 @@ msgstr "Teilen" msgid "Download" msgstr "Herunterladen" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "Upload zu groß" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server." -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Dateien werden gescannt, bitte warten." -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "Scannen" diff --git a/l10n/el/files.po b/l10n/el/files.po index 8ddd036c71..0daee77ea7 100644 --- a/l10n/el/files.po +++ b/l10n/el/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,11 @@ msgstr "Η εγγραφή στο δίσκο απέτυχε" msgid "Files" msgstr "Αρχεία" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Διαγραφή" @@ -78,7 +82,7 @@ msgstr "ακύρωση" msgid "replaced" msgstr "αντικαταστάθηκε" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "αναίρεση" @@ -86,7 +90,11 @@ msgstr "αναίρεση" msgid "with" msgstr "με" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "διαγράφηκε" @@ -119,11 +127,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Μέγεθος" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Τροποποιήθηκε" @@ -199,36 +207,36 @@ msgstr "Μεταφόρτωση" msgid "Cancel upload" msgstr "Ακύρωση ανεβάσματος" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Όνομα" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Διαμοίρασε" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Λήψη" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Πολύ μεγάλο το αρχείο προς μεταφόρτωση" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Τα αρχεία ανιχνεύονται, παρακαλώ περιμένετε" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Τρέχουσα αναζήτηση " diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po index 3752a64b5d..0509e10da4 100644 --- a/l10n/el/user_ldap.po +++ b/l10n/el/user_ldap.po @@ -4,19 +4,20 @@ # # Translators: # Efstathios Iosifidis , 2012. +# Marios Bekatoros <>, 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 \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 07:17+0000\n" +"Last-Translator: Marios Bekatoros <>\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" #: templates/settings.php:8 msgid "Host" @@ -29,7 +30,7 @@ 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" @@ -37,7 +38,7 @@ msgstr "" #: templates/settings.php:10 msgid "User DN" -msgstr "" +msgstr "User DN" #: templates/settings.php:10 msgid "" @@ -56,7 +57,7 @@ msgstr "" #: templates/settings.php:12 msgid "User Login Filter" -msgstr "" +msgstr "User Login Filter" #: templates/settings.php:12 #, php-format @@ -72,7 +73,7 @@ msgstr "" #: templates/settings.php:13 msgid "User List Filter" -msgstr "" +msgstr "User List Filter" #: templates/settings.php:13 msgid "Defines the filter to apply, when retrieving users." @@ -84,7 +85,7 @@ msgstr "" #: templates/settings.php:14 msgid "Group Filter" -msgstr "" +msgstr "Group Filter" #: templates/settings.php:14 msgid "Defines the filter to apply, when retrieving groups." @@ -100,19 +101,19 @@ msgstr "Θύρα" #: templates/settings.php:18 msgid "Base User Tree" -msgstr "" +msgstr "Base User Tree" #: templates/settings.php:19 msgid "Base Group Tree" -msgstr "" +msgstr "Base Group Tree" #: templates/settings.php:20 msgid "Group-Member association" -msgstr "" +msgstr "Group-Member association" #: 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." @@ -138,7 +139,7 @@ msgstr "" #: templates/settings.php:24 msgid "User Display Name Field" -msgstr "" +msgstr "User Display Name Field" #: templates/settings.php:24 msgid "The LDAP attribute to use to generate the user`s ownCloud name." @@ -146,7 +147,7 @@ msgstr "" #: templates/settings.php:25 msgid "Group Display Name Field" -msgstr "" +msgstr "Group Display Name Field" #: templates/settings.php:25 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." diff --git a/l10n/eo/files.po b/l10n/eo/files.po index d0b82a0e4f..c8529b431a 100644 --- a/l10n/eo/files.po +++ b/l10n/eo/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "Malsukcesis skribo al disko" msgid "Files" msgstr "Dosieroj" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Forigi" @@ -77,7 +81,7 @@ msgstr "nuligi" msgid "replaced" msgstr "anstataŭigita" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "malfari" @@ -85,7 +89,11 @@ msgstr "malfari" msgid "with" msgstr "kun" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "forigita" @@ -118,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Nevalida nomo, “/” ne estas permesata." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Grando" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Modifita" @@ -198,36 +206,36 @@ msgstr "Alŝuti" msgid "Cancel upload" msgstr "Nuligi alŝuton" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Nenio estas ĉi tie. Alŝutu ion!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nomo" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Kunhavigi" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Elŝuti" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Elŝuto tro larĝa" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Dosieroj estas skanataj, bonvolu atendi." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Nuna skano" diff --git a/l10n/es/files.po b/l10n/es/files.po index 1889dd54e9..4c7a65443d 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 05:09+0000\n" -"Last-Translator: juanman \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,11 @@ msgstr "La escritura en disco ha fallado" msgid "Files" msgstr "Archivos" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Eliminado" @@ -79,7 +83,7 @@ msgstr "cancelar" msgid "replaced" msgstr "reemplazado" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "deshacer" @@ -87,7 +91,11 @@ msgstr "deshacer" msgid "with" msgstr "con" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "borrado" @@ -124,7 +132,7 @@ msgstr "Nombre no válido, '/' no está permitido." msgid "Size" msgstr "Tamaño" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Modificado" @@ -216,20 +224,20 @@ msgstr "Compartir" msgid "Download" msgstr "Descargar" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "El archivo es demasiado grande" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor." -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Se están escaneando los archivos, por favor espere." -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "Escaneo actual" diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index fac2c5dc01..7ce5cdf145 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,11 @@ msgstr "Kettale kirjutamine ebaõnnestus" msgid "Files" msgstr "Failid" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Kustuta" @@ -76,7 +80,7 @@ msgstr "loobu" msgid "replaced" msgstr "asendatud" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "tagasi" @@ -84,7 +88,11 @@ msgstr "tagasi" msgid "with" msgstr "millega" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "kustutatud" @@ -117,11 +125,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Vigane nimi, '/' pole lubatud." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Suurus" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Muudetud" @@ -197,36 +205,36 @@ msgstr "Lae üles" msgid "Cancel upload" msgstr "Tühista üleslaadimine" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Siin pole midagi. Lae midagi üles!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nimi" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Jaga" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Lae alla" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Üleslaadimine on liiga suur" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Faile skannitakse, palun oota" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Praegune skannimine" diff --git a/l10n/eu/files.po b/l10n/eu/files.po index 810a5ae18c..8f0d7e685d 100644 --- a/l10n/eu/files.po +++ b/l10n/eu/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "Errore bat izan da diskoan idazterakoan" msgid "Files" msgstr "Fitxategiak" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Ezabatu" @@ -77,7 +81,7 @@ msgstr "ezeztatu" msgid "replaced" msgstr "ordeztua" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "desegin" @@ -85,7 +89,11 @@ msgstr "desegin" msgid "with" msgstr "honekin" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "ezabatuta" @@ -118,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Baliogabeko izena, '/' ezin da erabili. " -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Tamaina" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Aldatuta" @@ -198,36 +206,36 @@ msgstr "Igo" msgid "Cancel upload" msgstr "Ezeztatu igoera" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Ez dago ezer. Igo zerbait!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Izena" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Elkarbanatu" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Deskargatu" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Igotakoa handiegia da" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Orain eskaneatzen ari da" diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po index f23e12e728..1fb2c354a9 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-05 02:02+0200\n" -"PO-Revision-Date: 2012-09-05 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 14:30+0000\n" +"Last-Translator: asieriko \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" @@ -31,11 +31,11 @@ msgstr "Autentifikazio errorea" #: ajax/creategroup.php:19 msgid "Group already exists" -msgstr "" +msgstr "Taldea dagoeneko existitzenda" #: ajax/creategroup.php:28 msgid "Unable to add group" -msgstr "" +msgstr "Ezin izan da taldea gehitu" #: ajax/lostpassword.php:14 msgid "Email saved" @@ -55,11 +55,11 @@ msgstr "Baliogabeko eskaria" #: ajax/removegroup.php:16 msgid "Unable to delete group" -msgstr "" +msgstr "Ezin izan da taldea ezabatu" #: ajax/removeuser.php:22 msgid "Unable to delete user" -msgstr "" +msgstr "Ezin izan da erabiltzailea ezabatu" #: ajax/setlanguage.php:18 msgid "Language changed" @@ -68,12 +68,12 @@ msgstr "Hizkuntza aldatuta" #: ajax/togglegroups.php:25 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "Ezin izan da erabiltzailea %s taldera gehitu" #: ajax/togglegroups.php:31 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu" #: js/apps.js:18 msgid "Error" @@ -192,7 +192,7 @@ msgstr "Ikusi programen orria apps.owncloud.com en" #: templates/apps.php:30 msgid "-licensed by " -msgstr "" +msgstr "-lizentziatua " #: templates/help.php:9 msgid "Documentation" diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po index 0ed5582c4f..0b6110c70d 100644 --- a/l10n/eu_ES/files.po +++ b/l10n/eu_ES/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -116,11 +124,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -196,36 +204,36 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/fa/files.po b/l10n/fa/files.po index 2e1f164504..37b2cc70c3 100644 --- a/l10n/fa/files.po +++ b/l10n/fa/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,11 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود" msgid "Files" msgstr "فایل ها" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "پاک کردن" @@ -78,7 +82,7 @@ msgstr "لغو" msgid "replaced" msgstr "جایگزین‌شده" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "بازگشت" @@ -86,7 +90,11 @@ msgstr "بازگشت" msgid "with" msgstr "همراه" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "حذف شده" @@ -119,11 +127,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "نام نامناسب '/' غیرفعال است" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "اندازه" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "تغییر یافته" @@ -199,36 +207,36 @@ msgstr "بارگذاری" msgid "Cancel upload" msgstr "متوقف کردن بار گذاری" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "اینجا هیچ چیز نیست." -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "نام" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "به اشتراک گذاری" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "بارگیری" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "حجم بارگذاری بسیار زیاد است" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "بازرسی کنونی" diff --git a/l10n/fi/files.po b/l10n/fi/files.po index 0a9580f346..1d569839df 100644 --- a/l10n/fi/files.po +++ b/l10n/fi/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/owncloud/language/fi/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -116,11 +124,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -196,36 +204,36 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po index 67278ea29f..c642c07ab8 100644 --- a/l10n/fi_FI/files.po +++ b/l10n/fi_FI/files.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 10:47+0000\n" -"Last-Translator: Jiri Grönroos \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \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" @@ -56,7 +56,11 @@ msgstr "Levylle kirjoitus epäonnistui" msgid "Files" msgstr "Tiedostot" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Poista" @@ -80,7 +84,7 @@ msgstr "peru" msgid "replaced" msgstr "korvattu" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "kumoa" @@ -88,7 +92,11 @@ msgstr "kumoa" msgid "with" msgstr "käyttäen" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "poistettu" @@ -125,7 +133,7 @@ msgstr "Virheellinen nimi, merkki '/' ei ole sallittu." msgid "Size" msgstr "Koko" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Muutettu" @@ -217,20 +225,20 @@ msgstr "Jaa" msgid "Download" msgstr "Lataa" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "Lähetettävä tiedosto on liian suuri" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan." -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Tiedostoja tarkistetaan, odota hetki." -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "Tämänhetkinen tutkinta" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index 222dbece71..bd3172a21d 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,11 @@ msgstr "Erreur d'écriture sur le disque" msgid "Files" msgstr "Fichiers" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Supprimer" @@ -74,7 +78,7 @@ msgstr "remplacer" #: js/filelist.js:186 msgid "suggest name" -msgstr "" +msgstr "Suggérer un nom" #: js/filelist.js:186 js/filelist.js:188 msgid "cancel" @@ -84,7 +88,7 @@ msgstr "annuler" msgid "replaced" msgstr "remplacé" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "annuler" @@ -92,7 +96,11 @@ msgstr "annuler" msgid "with" msgstr "avec" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "supprimé" @@ -125,11 +133,11 @@ msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera msgid "Invalid name, '/' is not allowed." msgstr "Nom invalide, '/' n'est pas autorisé." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Taille" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Modifié" @@ -205,36 +213,36 @@ msgstr "Envoyer" msgid "Cancel upload" msgstr "Annuler l'envoi" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nom" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Partager" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Téléchargement" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Fichier trop volumineux" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Les fichiers sont en cours d'analyse, veuillez patienter." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Analyse en cours" diff --git a/l10n/gl/files.po b/l10n/gl/files.po index 0de0ff2a7d..f51ab64695 100644 --- a/l10n/gl/files.po +++ b/l10n/gl/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "Erro ao escribir no disco" msgid "Files" msgstr "Ficheiros" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Eliminar" @@ -77,7 +81,7 @@ msgstr "cancelar" msgid "replaced" msgstr "substituído" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "desfacer" @@ -85,7 +89,11 @@ msgstr "desfacer" msgid "with" msgstr "con" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "eliminado" @@ -118,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Nome non válido, '/' non está permitido." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Tamaño" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Modificado" @@ -198,36 +206,36 @@ msgstr "Enviar" msgid "Cancel upload" msgstr "Cancelar subida" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Nada por aquí. Envíe algo." -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nome" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Compartir" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Descargar" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Envío demasiado grande" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Estanse analizando os ficheiros, espere por favor." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Análise actual." diff --git a/l10n/he/files.po b/l10n/he/files.po index 808345fa8f..5cac6d4e90 100644 --- a/l10n/he/files.po +++ b/l10n/he/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,11 @@ msgstr "הכתיבה לכונן נכשלה" msgid "Files" msgstr "קבצים" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "מחיקה" @@ -78,7 +82,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -86,7 +90,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -119,11 +127,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "שם לא חוקי, '/' אסור לשימוש." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "גודל" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "זמן שינוי" @@ -199,36 +207,36 @@ msgstr "העלאה" msgid "Cancel upload" msgstr "ביטול ההעלאה" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "שם" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "שיתוף" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "הורדה" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "העלאה גדולה מידי" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "הקבצים נסרקים, נא להמתין." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "הסריקה הנוכחית" diff --git a/l10n/hi/files.po b/l10n/hi/files.po index b4b909333c..238575d5e4 100644 --- a/l10n/hi/files.po +++ b/l10n/hi/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -116,11 +124,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -196,36 +204,36 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/hr/files.po b/l10n/hr/files.po index 6163c004ba..c7d3870a5a 100644 --- a/l10n/hr/files.po +++ b/l10n/hr/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,11 @@ msgstr "Neuspjelo pisanje na disk" msgid "Files" msgstr "Datoteke" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Briši" @@ -78,7 +82,7 @@ msgstr "odustani" msgid "replaced" msgstr "zamjenjeno" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "vrati" @@ -86,7 +90,11 @@ msgstr "vrati" msgid "with" msgstr "sa" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "izbrisano" @@ -119,11 +127,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Neispravan naziv, znak '/' nije dozvoljen." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Veličina" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Zadnja promjena" @@ -199,36 +207,36 @@ msgstr "Pošalji" msgid "Cancel upload" msgstr "Prekini upload" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Nema ničega u ovoj mapi. Pošalji nešto!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Naziv" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "podjeli" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Preuzmi" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Prijenos je preobiman" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Datoteke se skeniraju, molimo pričekajte." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Trenutno skeniranje" diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po index ca00f03792..09722e3871 100644 --- a/l10n/hu_HU/files.po +++ b/l10n/hu_HU/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,11 @@ msgstr "Nem írható lemezre" msgid "Files" msgstr "Fájlok" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Törlés" @@ -78,7 +82,7 @@ msgstr "mégse" msgid "replaced" msgstr "kicserélve" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "visszavon" @@ -86,7 +90,11 @@ msgstr "visszavon" msgid "with" msgstr "-val/-vel" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "törölve" @@ -119,11 +127,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Érvénytelen név, a '/' nem megengedett" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Méret" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Módosítva" @@ -199,36 +207,36 @@ msgstr "Feltöltés" msgid "Cancel upload" msgstr "Feltöltés megszakítása" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Töltsön fel egy fájlt." -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Név" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Megosztás" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Letöltés" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Feltöltés túl nagy" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "File-ok vizsgálata, kis türelmet" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Aktuális vizsgálat" diff --git a/l10n/hy/files.po b/l10n/hy/files.po index e94b853649..9a144a8130 100644 --- a/l10n/hy/files.po +++ b/l10n/hy/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -116,11 +124,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -196,36 +204,36 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/ia/files.po b/l10n/ia/files.po index 0324e32bd0..cdce2e1a66 100644 --- a/l10n/ia/files.po +++ b/l10n/ia/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "" msgid "Files" msgstr "Files" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Deler" @@ -77,7 +81,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -85,7 +89,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -118,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Dimension" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Modificate" @@ -198,36 +206,36 @@ msgstr "Incargar" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Nihil hic. Incarga alcun cosa!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nomine" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Discargar" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Incargamento troppo longe" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/id/files.po b/l10n/id/files.po index 5e1a38df08..9479165468 100644 --- a/l10n/id/files.po +++ b/l10n/id/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,11 @@ msgstr "Gagal menulis ke disk" msgid "Files" msgstr "Berkas" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Hapus" @@ -78,7 +82,7 @@ msgstr "batalkan" msgid "replaced" msgstr "diganti" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "batal dikerjakan" @@ -86,7 +90,11 @@ msgstr "batal dikerjakan" msgid "with" msgstr "dengan" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "dihapus" @@ -119,11 +127,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Kesalahan nama, '/' tidak diijinkan." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Ukuran" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Dimodifikasi" @@ -199,36 +207,36 @@ msgstr "Unggah" msgid "Cancel upload" msgstr "Batal mengunggah" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nama" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Bagikan" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Unduh" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Unggahan terlalu besar" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Berkas sedang dipindai, silahkan tunggu." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Sedang memindai" diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po index 3ef54242d3..813b83410c 100644 --- a/l10n/id_ID/files.po +++ b/l10n/id_ID/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/owncloud/language/id_ID/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -116,11 +124,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -196,36 +204,36 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/it/files.po b/l10n/it/files.po index 6175346abd..8d0209eb47 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 04:57+0000\n" -"Last-Translator: Vincenzo Reale \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \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" @@ -55,7 +55,11 @@ msgstr "Scrittura su disco non riuscita" msgid "Files" msgstr "File" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Elimina" @@ -79,7 +83,7 @@ msgstr "annulla" msgid "replaced" msgstr "sostituito" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "annulla" @@ -87,7 +91,11 @@ msgstr "annulla" msgid "with" msgstr "con" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "eliminati" @@ -124,7 +132,7 @@ msgstr "Nome non valido" msgid "Size" msgstr "Dimensione" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Modificato" @@ -216,20 +224,20 @@ msgstr "Condividi" msgid "Download" msgstr "Scarica" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "Il file caricato è troppo grande" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server." -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Scansione dei file in corso, attendi" -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "Scansione corrente" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index c73d204ecb..5dec378931 100644 --- a/l10n/ja_JP/files.po +++ b/l10n/ja_JP/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "ディスクへの書き込みに失敗しました" msgid "Files" msgstr "ファイル" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "削除" @@ -77,7 +81,7 @@ msgstr "キャンセル" msgid "replaced" msgstr "置換：" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "元に戻す" @@ -85,7 +89,11 @@ msgstr "元に戻す" msgid "with" msgstr "←" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "削除" @@ -118,11 +126,11 @@ msgstr "ファイル転送を実行中です。今このページから移動す msgid "Invalid name, '/' is not allowed." msgstr "無効な名前、'/' は使用できません。" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "サイズ" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "更新日時" @@ -198,36 +206,36 @@ msgstr "アップロード" msgid "Cancel upload" msgstr "アップロードをキャンセル" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "ここには何もありません。何かアップロードしてください。" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "名前" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "共有" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "ダウンロード" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "ファイルサイズが大きすぎます" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "ファイルをスキャンしています、しばらくお待ちください。" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "スキャン中" diff --git a/l10n/ko/files.po b/l10n/ko/files.po index 2abe6f9ed6..7167506ae4 100644 --- a/l10n/ko/files.po +++ b/l10n/ko/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "디스크에 쓰지 못했습니다" msgid "Files" msgstr "파일" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "삭제" @@ -77,7 +81,7 @@ msgstr "취소" msgid "replaced" msgstr "대체됨" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "복구" @@ -85,7 +89,11 @@ msgstr "복구" msgid "with" msgstr "와" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "삭제" @@ -118,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "잘못된 이름, '/' 은 허용이 되지 않습니다." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "크기" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "수정됨" @@ -198,36 +206,36 @@ msgstr "업로드" msgid "Cancel upload" msgstr "업로드 취소" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "내용이 없습니다. 업로드할 수 있습니다!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "이름" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "공유" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "다운로드" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "업로드 용량 초과" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "파일을 검색중입니다, 기다려 주십시오." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "커런트 스캐닝" diff --git a/l10n/lb/files.po b/l10n/lb/files.po index bdce420aa1..6e4157f7be 100644 --- a/l10n/lb/files.po +++ b/l10n/lb/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,11 @@ msgstr "Konnt net op den Disk schreiwen" msgid "Files" msgstr "Dateien" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Läschen" @@ -76,7 +80,7 @@ msgstr "ofbriechen" msgid "replaced" msgstr "ersat" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "réckgängeg man" @@ -84,7 +88,11 @@ msgstr "réckgängeg man" msgid "with" msgstr "mat" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "geläscht" @@ -117,11 +125,11 @@ msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofg msgid "Invalid name, '/' is not allowed." msgstr "Ongültege Numm, '/' net erlaabt." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Gréisst" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Geännert" @@ -197,36 +205,36 @@ msgstr "Eroplueden" msgid "Cancel upload" msgstr "Upload ofbriechen" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Hei ass näischt. Lued eppes rop!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Numm" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Share" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Eroflueden" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Upload ze grouss" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Déi Dateien déi Dir probéiert erop ze lueden sinn méi grouss wei déi Maximal Gréisst déi op dësem Server erlaabt ass." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Fichieren gi gescannt, war weg." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Momentane Scan" diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po index 058124ee7f..d4a5701df7 100644 --- a/l10n/lt_LT/files.po +++ b/l10n/lt_LT/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "Nepavyko įrašyti į diską" msgid "Files" msgstr "Failai" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Ištrinti" @@ -77,7 +81,7 @@ msgstr "atšaukti" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -85,7 +89,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -118,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Pavadinime negali būti naudojamas ženklas \"/\"." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Dydis" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Pakeista" @@ -198,36 +206,36 @@ msgstr "Įkelti" msgid "Cancel upload" msgstr "Atšaukti siuntimą" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Čia tuščia. Įkelkite ką nors!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Pavadinimas" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Dalintis" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Atsisiųsti" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Įkėlimui failas per didelis" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Skenuojami failai, prašome palaukti." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Šiuo metu skenuojama" diff --git a/l10n/lv/files.po b/l10n/lv/files.po index 5b5c7464b7..4adbfa4bf0 100644 --- a/l10n/lv/files.po +++ b/l10n/lv/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,11 @@ msgstr "Nav iespējams saglabāt" msgid "Files" msgstr "Faili" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Izdzēst" @@ -76,7 +80,7 @@ msgstr "atcelt" msgid "replaced" msgstr "aizvietots" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "vienu soli atpakaļ" @@ -84,7 +88,11 @@ msgstr "vienu soli atpakaļ" msgid "with" msgstr "ar" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "izdzests" @@ -117,11 +125,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Šis simbols '/', nav atļauts." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Izmērs" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Izmainīts" @@ -197,36 +205,36 @@ msgstr "Augšuplādet" msgid "Cancel upload" msgstr "Atcelt augšuplādi" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Te vēl nekas nav. Rīkojies, sāc augšuplādēt" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nosaukums" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Līdzdalīt" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Lejuplādēt" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Fails ir par lielu lai to augšuplādetu" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Faili šobrīd tiek caurskatīti, nedaudz jāpagaida." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Šobrīd tiek pārbaudīti" diff --git a/l10n/mk/files.po b/l10n/mk/files.po index 7b01b54341..7793167ca3 100644 --- a/l10n/mk/files.po +++ b/l10n/mk/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,11 @@ msgstr "Неуспеав да запишам на диск" msgid "Files" msgstr "Датотеки" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Избриши" @@ -78,7 +82,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -86,7 +90,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -119,11 +127,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "неисправно име, '/' не е дозволено." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Големина" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Променето" @@ -199,36 +207,36 @@ msgstr "Подигни" msgid "Cancel upload" msgstr "Откажи прикачување" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Тука нема ништо. Снимете нешто!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Име" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Сподели" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Преземи" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Датотеката е премногу голема" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Се скенираат датотеки, ве молам почекајте." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Моментално скенирам" diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po index 8c80a09dc7..e429d35b82 100644 --- a/l10n/ms_MY/files.po +++ b/l10n/ms_MY/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,11 @@ msgstr "Gagal untuk disimpan" msgid "Files" msgstr "fail" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Padam" @@ -79,7 +83,7 @@ msgstr "Batal" msgid "replaced" msgstr "diganti" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -87,7 +91,11 @@ msgstr "" msgid "with" msgstr "dengan" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "dihapus" @@ -120,11 +128,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "penggunaa nama tidak sah, '/' tidak dibenarkan." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Saiz" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Dimodifikasi" @@ -200,36 +208,36 @@ msgstr "Muat naik" msgid "Cancel upload" msgstr "Batal muat naik" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Tiada apa-apa di sini. Muat naik sesuatu!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nama " -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Kongsi" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Muat turun" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Muat naik terlalu besar" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Fail sedang diimbas, harap bersabar." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Imbasan semasa" diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po index c39e87c982..8366b5c7be 100644 --- a/l10n/nb_NO/files.po +++ b/l10n/nb_NO/files.po @@ -7,13 +7,14 @@ # Arvid Nornes , 2012. # Christer Eriksson , 2012. # Daniel , 2012. +# , 2012. # , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n" "MIME-Version: 1.0\n" @@ -56,7 +57,11 @@ msgstr "Klarte ikke å skrive til disk" msgid "Files" msgstr "Filer" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Slett" @@ -80,7 +85,7 @@ msgstr "avbryt" msgid "replaced" msgstr "erstattet" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "angre" @@ -88,7 +93,11 @@ msgstr "angre" msgid "with" msgstr "med" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "slettet" @@ -121,11 +130,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Ugyldig navn, '/' er ikke tillatt. " -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Størrelse" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Endret" @@ -175,7 +184,7 @@ msgstr "Maksimal størrelse på ZIP-filer" #: templates/admin.php:14 msgid "Save" -msgstr "" +msgstr "Lagre" #: templates/index.php:7 msgid "New" @@ -201,36 +210,36 @@ msgstr "Last opp" msgid "Cancel upload" msgstr "Avbryt opplasting" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last opp noe!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Navn" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Del" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Last ned" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Opplasting for stor" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filene du prøver å laste opp er for store for å laste opp til denne serveren." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Skanner etter filer, vennligst vent." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Pågående skanning" diff --git a/l10n/nl/files.po b/l10n/nl/files.po index b710bae7f6..95befc34bd 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,11 @@ msgstr "Schrijven naar schijf mislukt" msgid "Files" msgstr "Bestanden" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Verwijder" @@ -74,7 +78,7 @@ msgstr "vervang" #: js/filelist.js:186 msgid "suggest name" -msgstr "" +msgstr "Stel een naam voor" #: js/filelist.js:186 js/filelist.js:188 msgid "cancel" @@ -84,7 +88,7 @@ msgstr "annuleren" msgid "replaced" msgstr "vervangen" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "ongedaan maken" @@ -92,7 +96,11 @@ msgstr "ongedaan maken" msgid "with" msgstr "door" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "verwijderd" @@ -125,11 +133,11 @@ msgstr "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de msgid "Invalid name, '/' is not allowed." msgstr "Ongeldige naam, '/' is niet toegestaan." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Bestandsgrootte" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Laatst aangepast" @@ -205,36 +213,36 @@ msgstr "Upload" msgid "Cancel upload" msgstr "Upload afbreken" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Er bevindt zich hier niets. Upload een bestand!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Naam" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Delen" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Download" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Bestanden te groot" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane bestandsgrootte voor deze server." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Bestanden worden gescand, even wachten." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Er wordt gescand" diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po index 207f04819e..8644b83dc0 100644 --- a/l10n/nl/settings.po +++ b/l10n/nl/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-06 02:02+0200\n" -"PO-Revision-Date: 2012-09-05 11:28+0000\n" -"Last-Translator: diederikdehaas \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 13:23+0000\n" +"Last-Translator: Richard Bos \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" @@ -111,7 +111,7 @@ msgid "" "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." -msgstr "" +msgstr "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." #: templates/admin.php:31 msgid "Cron" diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po index fc058e3f3e..f473b58ff4 100644 --- a/l10n/nn_NO/files.po +++ b/l10n/nn_NO/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "" msgid "Files" msgstr "Filer" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Slett" @@ -77,7 +81,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -85,7 +89,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -118,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Storleik" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Endra" @@ -198,36 +206,36 @@ msgstr "Last opp" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Ingenting her. Last noko opp!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Namn" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Last ned" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "For stor opplasting" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/oc/core.po b/l10n/oc/core.po new file mode 100644 index 0000000000..00223969d7 --- /dev/null +++ b/l10n/oc/core.po @@ -0,0 +1,268 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2011-07-25 16:05+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23 +msgid "Application name not provided." +msgstr "" + +#: ajax/vcategories/add.php:29 +msgid "No category to add?" +msgstr "" + +#: ajax/vcategories/add.php:36 +msgid "This category already exists: " +msgstr "" + +#: js/js.js:208 templates/layout.user.php:54 templates/layout.user.php:55 +msgid "Settings" +msgstr "" + +#: js/js.js:593 +msgid "January" +msgstr "" + +#: js/js.js:593 +msgid "February" +msgstr "" + +#: js/js.js:593 +msgid "March" +msgstr "" + +#: js/js.js:593 +msgid "April" +msgstr "" + +#: js/js.js:593 +msgid "May" +msgstr "" + +#: js/js.js:593 +msgid "June" +msgstr "" + +#: js/js.js:594 +msgid "July" +msgstr "" + +#: js/js.js:594 +msgid "August" +msgstr "" + +#: js/js.js:594 +msgid "September" +msgstr "" + +#: js/js.js:594 +msgid "October" +msgstr "" + +#: js/js.js:594 +msgid "November" +msgstr "" + +#: js/js.js:594 +msgid "December" +msgstr "" + +#: js/oc-dialogs.js:143 js/oc-dialogs.js:163 +msgid "Cancel" +msgstr "" + +#: js/oc-dialogs.js:159 +msgid "No" +msgstr "" + +#: js/oc-dialogs.js:160 +msgid "Yes" +msgstr "" + +#: js/oc-dialogs.js:177 +msgid "Ok" +msgstr "" + +#: js/oc-vcategories.js:68 +msgid "No categories selected for deletion." +msgstr "" + +#: js/oc-vcategories.js:68 +msgid "Error" +msgstr "" + +#: lostpassword/index.php:26 +msgid "ownCloud password reset" +msgstr "" + +#: lostpassword/templates/email.php:2 +msgid "Use the following link to reset your password: {link}" +msgstr "" + +#: lostpassword/templates/lostpassword.php:3 +msgid "You will receive a link to reset your password via Email." +msgstr "" + +#: lostpassword/templates/lostpassword.php:5 +msgid "Requested" +msgstr "" + +#: lostpassword/templates/lostpassword.php:8 +msgid "Login failed!" +msgstr "" + +#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26 +#: templates/login.php:9 +msgid "Username" +msgstr "" + +#: lostpassword/templates/lostpassword.php:15 +msgid "Request reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:4 +msgid "Your password was reset" +msgstr "" + +#: lostpassword/templates/resetpassword.php:5 +msgid "To login page" +msgstr "" + +#: lostpassword/templates/resetpassword.php:8 +msgid "New password" +msgstr "" + +#: lostpassword/templates/resetpassword.php:11 +msgid "Reset password" +msgstr "" + +#: strings.php:5 +msgid "Personal" +msgstr "" + +#: strings.php:6 +msgid "Users" +msgstr "" + +#: strings.php:7 +msgid "Apps" +msgstr "" + +#: strings.php:8 +msgid "Admin" +msgstr "" + +#: strings.php:9 +msgid "Help" +msgstr "" + +#: templates/403.php:12 +msgid "Access forbidden" +msgstr "" + +#: templates/404.php:12 +msgid "Cloud not found" +msgstr "" + +#: templates/edit_categories_dialog.php:4 +msgid "Edit categories" +msgstr "" + +#: templates/edit_categories_dialog.php:14 +msgid "Add" +msgstr "" + +#: templates/installation.php:24 +msgid "Create an admin account" +msgstr "" + +#: templates/installation.php:30 templates/login.php:13 +msgid "Password" +msgstr "" + +#: templates/installation.php:36 +msgid "Advanced" +msgstr "" + +#: templates/installation.php:38 +msgid "Data folder" +msgstr "" + +#: templates/installation.php:45 +msgid "Configure the database" +msgstr "" + +#: templates/installation.php:50 templates/installation.php:61 +#: templates/installation.php:71 templates/installation.php:81 +msgid "will be used" +msgstr "" + +#: templates/installation.php:93 +msgid "Database user" +msgstr "" + +#: templates/installation.php:97 +msgid "Database password" +msgstr "" + +#: templates/installation.php:101 +msgid "Database name" +msgstr "" + +#: templates/installation.php:109 +msgid "Database tablespace" +msgstr "" + +#: templates/installation.php:115 +msgid "Database host" +msgstr "" + +#: templates/installation.php:120 +msgid "Finish setup" +msgstr "" + +#: templates/layout.guest.php:36 +msgid "web services under your control" +msgstr "" + +#: templates/layout.user.php:39 +msgid "Log out" +msgstr "" + +#: templates/login.php:6 +msgid "Lost your password?" +msgstr "" + +#: templates/login.php:17 +msgid "remember" +msgstr "" + +#: templates/login.php:18 +msgid "Log in" +msgstr "" + +#: templates/logout.php:1 +msgid "You are logged out." +msgstr "" + +#: templates/part.pagenavi.php:3 +msgid "prev" +msgstr "" + +#: templates/part.pagenavi.php:20 +msgid "next" +msgstr "" diff --git a/l10n/oc/files.po b/l10n/oc/files.po new file mode 100644 index 0000000000..a6f4c0b62c --- /dev/null +++ b/l10n/oc/files.po @@ -0,0 +1,239 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ajax/upload.php:20 +msgid "There is no error, the file uploaded with success" +msgstr "" + +#: ajax/upload.php:21 +msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini" +msgstr "" + +#: ajax/upload.php:22 +msgid "" +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " +"the HTML form" +msgstr "" + +#: ajax/upload.php:23 +msgid "The uploaded file was only partially uploaded" +msgstr "" + +#: ajax/upload.php:24 +msgid "No file was uploaded" +msgstr "" + +#: ajax/upload.php:25 +msgid "Missing a temporary folder" +msgstr "" + +#: ajax/upload.php:26 +msgid "Failed to write to disk" +msgstr "" + +#: appinfo/app.php:6 +msgid "Files" +msgstr "" + +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 +msgid "Delete" +msgstr "" + +#: js/filelist.js:186 js/filelist.js:188 +msgid "already exists" +msgstr "" + +#: js/filelist.js:186 js/filelist.js:188 +msgid "replace" +msgstr "" + +#: js/filelist.js:186 +msgid "suggest name" +msgstr "" + +#: js/filelist.js:186 js/filelist.js:188 +msgid "cancel" +msgstr "" + +#: js/filelist.js:235 js/filelist.js:237 +msgid "replaced" +msgstr "" + +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 +msgid "undo" +msgstr "" + +#: js/filelist.js:237 +msgid "with" +msgstr "" + +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 +msgid "deleted" +msgstr "" + +#: js/files.js:179 +msgid "generating ZIP-file, it may take some time." +msgstr "" + +#: js/files.js:208 +msgid "Unable to upload your file as it is a directory or has 0 bytes" +msgstr "" + +#: js/files.js:208 +msgid "Upload Error" +msgstr "" + +#: js/files.js:236 js/files.js:341 js/files.js:370 +msgid "Pending" +msgstr "" + +#: js/files.js:355 +msgid "Upload cancelled." +msgstr "" + +#: js/files.js:423 +msgid "" +"File upload is in progress. Leaving the page now will cancel the upload." +msgstr "" + +#: js/files.js:493 +msgid "Invalid name, '/' is not allowed." +msgstr "" + +#: js/files.js:746 templates/index.php:56 +msgid "Size" +msgstr "" + +#: js/files.js:747 templates/index.php:58 +msgid "Modified" +msgstr "" + +#: js/files.js:774 +msgid "folder" +msgstr "" + +#: js/files.js:776 +msgid "folders" +msgstr "" + +#: js/files.js:784 +msgid "file" +msgstr "" + +#: js/files.js:786 +msgid "files" +msgstr "" + +#: templates/admin.php:5 +msgid "File handling" +msgstr "" + +#: templates/admin.php:7 +msgid "Maximum upload size" +msgstr "" + +#: templates/admin.php:7 +msgid "max. possible: " +msgstr "" + +#: templates/admin.php:9 +msgid "Needed for multi-file and folder downloads." +msgstr "" + +#: templates/admin.php:9 +msgid "Enable ZIP-download" +msgstr "" + +#: templates/admin.php:11 +msgid "0 is unlimited" +msgstr "" + +#: templates/admin.php:12 +msgid "Maximum input size for ZIP files" +msgstr "" + +#: templates/admin.php:14 +msgid "Save" +msgstr "" + +#: templates/index.php:7 +msgid "New" +msgstr "" + +#: templates/index.php:9 +msgid "Text file" +msgstr "" + +#: templates/index.php:10 +msgid "Folder" +msgstr "" + +#: templates/index.php:11 +msgid "From url" +msgstr "" + +#: templates/index.php:21 +msgid "Upload" +msgstr "" + +#: templates/index.php:27 +msgid "Cancel upload" +msgstr "" + +#: templates/index.php:40 +msgid "Nothing in here. Upload something!" +msgstr "" + +#: templates/index.php:48 +msgid "Name" +msgstr "" + +#: templates/index.php:50 +msgid "Share" +msgstr "" + +#: templates/index.php:52 +msgid "Download" +msgstr "" + +#: templates/index.php:75 +msgid "Upload too large" +msgstr "" + +#: templates/index.php:77 +msgid "" +"The files you are trying to upload exceed the maximum size for file uploads " +"on this server." +msgstr "" + +#: templates/index.php:82 +msgid "Files are being scanned, please wait." +msgstr "" + +#: templates/index.php:85 +msgid "Current scanning" +msgstr "" diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po new file mode 100644 index 0000000000..d6e0c7a83b --- /dev/null +++ b/l10n/oc/files_encryption.po @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-08-12 22:33+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: templates/settings.php:3 +msgid "Encryption" +msgstr "" + +#: templates/settings.php:4 +msgid "Exclude the following file types from encryption" +msgstr "" + +#: templates/settings.php:5 +msgid "None" +msgstr "" + +#: templates/settings.php:10 +msgid "Enable Encryption" +msgstr "" diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po new file mode 100644 index 0000000000..5ddc431f8c --- /dev/null +++ b/l10n/oc/files_external.po @@ -0,0 +1,82 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-08-12 22:34+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: templates/settings.php:3 +msgid "External Storage" +msgstr "" + +#: templates/settings.php:7 templates/settings.php:19 +msgid "Mount point" +msgstr "" + +#: templates/settings.php:8 +msgid "Backend" +msgstr "" + +#: templates/settings.php:9 +msgid "Configuration" +msgstr "" + +#: templates/settings.php:10 +msgid "Options" +msgstr "" + +#: templates/settings.php:11 +msgid "Applicable" +msgstr "" + +#: templates/settings.php:23 +msgid "Add mount point" +msgstr "" + +#: templates/settings.php:54 templates/settings.php:62 +msgid "None set" +msgstr "" + +#: templates/settings.php:63 +msgid "All Users" +msgstr "" + +#: templates/settings.php:64 +msgid "Groups" +msgstr "" + +#: templates/settings.php:69 +msgid "Users" +msgstr "" + +#: templates/settings.php:77 templates/settings.php:96 +msgid "Delete" +msgstr "" + +#: templates/settings.php:88 +msgid "SSL root certificates" +msgstr "" + +#: templates/settings.php:102 +msgid "Import Root Certificate" +msgstr "" + +#: templates/settings.php:108 +msgid "Enable User External Storage" +msgstr "" + +#: templates/settings.php:109 +msgid "Allow users to mount their own external storage" +msgstr "" diff --git a/l10n/oc/files_sharing.po b/l10n/oc/files_sharing.po new file mode 100644 index 0000000000..1f90264d68 --- /dev/null +++ b/l10n/oc/files_sharing.po @@ -0,0 +1,38 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-08-12 22:35+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: templates/authenticate.php:4 +msgid "Password" +msgstr "" + +#: templates/authenticate.php:6 +msgid "Submit" +msgstr "" + +#: templates/public.php:9 templates/public.php:19 +msgid "Download" +msgstr "" + +#: templates/public.php:18 +msgid "No preview available for" +msgstr "" + +#: templates/public.php:25 +msgid "web services under your control" +msgstr "" diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po new file mode 100644 index 0000000000..d38fef98d5 --- /dev/null +++ b/l10n/oc/files_versions.po @@ -0,0 +1,34 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-08-12 22:37+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: js/settings-personal.js:31 templates/settings-personal.php:10 +msgid "Expire all versions" +msgstr "" + +#: templates/settings-personal.php:4 +msgid "Versions" +msgstr "" + +#: templates/settings-personal.php:7 +msgid "This will delete all existing backup versions of your files" +msgstr "" + +#: templates/settings.php:3 +msgid "Enable Files Versioning" +msgstr "" diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po new file mode 100644 index 0000000000..499df461d8 --- /dev/null +++ b/l10n/oc/lib.po @@ -0,0 +1,125 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-07-27 22:23+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: app.php:285 +msgid "Help" +msgstr "" + +#: app.php:292 +msgid "Personal" +msgstr "" + +#: app.php:297 +msgid "Settings" +msgstr "" + +#: app.php:302 +msgid "Users" +msgstr "" + +#: app.php:309 +msgid "Apps" +msgstr "" + +#: app.php:311 +msgid "Admin" +msgstr "" + +#: files.php:280 +msgid "ZIP download is turned off." +msgstr "" + +#: files.php:281 +msgid "Files need to be downloaded one by one." +msgstr "" + +#: files.php:281 files.php:306 +msgid "Back to Files" +msgstr "" + +#: files.php:305 +msgid "Selected files too large to generate zip file." +msgstr "" + +#: json.php:28 +msgid "Application is not enabled" +msgstr "" + +#: json.php:39 json.php:63 json.php:75 +msgid "Authentication error" +msgstr "" + +#: json.php:51 +msgid "Token expired. Please reload page." +msgstr "" + +#: template.php:87 +msgid "seconds ago" +msgstr "" + +#: template.php:88 +msgid "1 minute ago" +msgstr "" + +#: template.php:89 +#, php-format +msgid "%d minutes ago" +msgstr "" + +#: template.php:92 +msgid "today" +msgstr "" + +#: template.php:93 +msgid "yesterday" +msgstr "" + +#: template.php:94 +#, php-format +msgid "%d days ago" +msgstr "" + +#: template.php:95 +msgid "last month" +msgstr "" + +#: template.php:96 +msgid "months ago" +msgstr "" + +#: template.php:97 +msgid "last year" +msgstr "" + +#: template.php:98 +msgid "years ago" +msgstr "" + +#: updater.php:66 +#, php-format +msgid "%s is available. Get more information" +msgstr "" + +#: updater.php:68 +msgid "up to date" +msgstr "" + +#: updater.php:71 +msgid "updates check is disabled" +msgstr "" diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po new file mode 100644 index 0000000000..fe8e3adeb4 --- /dev/null +++ b/l10n/oc/settings.po @@ -0,0 +1,316 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2011-07-25 16:05+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ajax/apps/ocs.php:23 +msgid "Unable to load list from App Store" +msgstr "" + +#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18 +#: ajax/togglegroups.php:15 +msgid "Authentication error" +msgstr "" + +#: ajax/creategroup.php:19 +msgid "Group already exists" +msgstr "" + +#: ajax/creategroup.php:28 +msgid "Unable to add group" +msgstr "" + +#: ajax/lostpassword.php:14 +msgid "Email saved" +msgstr "" + +#: ajax/lostpassword.php:16 +msgid "Invalid email" +msgstr "" + +#: ajax/openid.php:16 +msgid "OpenID Changed" +msgstr "" + +#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23 +msgid "Invalid request" +msgstr "" + +#: ajax/removegroup.php:16 +msgid "Unable to delete group" +msgstr "" + +#: ajax/removeuser.php:22 +msgid "Unable to delete user" +msgstr "" + +#: ajax/setlanguage.php:18 +msgid "Language changed" +msgstr "" + +#: ajax/togglegroups.php:25 +#, php-format +msgid "Unable to add user to group %s" +msgstr "" + +#: ajax/togglegroups.php:31 +#, php-format +msgid "Unable to remove user from group %s" +msgstr "" + +#: js/apps.js:18 +msgid "Error" +msgstr "" + +#: js/apps.js:39 js/apps.js:73 +msgid "Disable" +msgstr "" + +#: js/apps.js:39 js/apps.js:62 +msgid "Enable" +msgstr "" + +#: js/personal.js:69 +msgid "Saving..." +msgstr "" + +#: personal.php:46 personal.php:47 +msgid "__language_name__" +msgstr "" + +#: templates/admin.php:14 +msgid "Security Warning" +msgstr "" + +#: templates/admin.php:17 +msgid "" +"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." +msgstr "" + +#: templates/admin.php:31 +msgid "Cron" +msgstr "" + +#: templates/admin.php:33 +msgid "execute one task with each page loaded" +msgstr "" + +#: templates/admin.php:35 +msgid "cron.php is registered at a webcron service" +msgstr "" + +#: templates/admin.php:37 +msgid "use systems cron service" +msgstr "" + +#: templates/admin.php:41 +msgid "Share API" +msgstr "" + +#: templates/admin.php:46 +msgid "Enable Share API" +msgstr "" + +#: templates/admin.php:47 +msgid "Allow apps to use the Share API" +msgstr "" + +#: templates/admin.php:51 +msgid "Allow links" +msgstr "" + +#: templates/admin.php:52 +msgid "Allow users to share items to the public with links" +msgstr "" + +#: templates/admin.php:56 +msgid "Allow resharing" +msgstr "" + +#: templates/admin.php:57 +msgid "Allow users to share items shared with them again" +msgstr "" + +#: templates/admin.php:60 +msgid "Allow users to share with anyone" +msgstr "" + +#: templates/admin.php:62 +msgid "Allow users to only share with users in their groups" +msgstr "" + +#: templates/admin.php:69 +msgid "Log" +msgstr "" + +#: templates/admin.php:97 +msgid "More" +msgstr "" + +#: templates/admin.php:105 +msgid "" +"Developed by the ownCloud community, the source code is " +"licensed under the AGPL." +msgstr "" + +#: templates/apps.php:10 +msgid "Add your App" +msgstr "" + +#: templates/apps.php:26 +msgid "Select an App" +msgstr "" + +#: templates/apps.php:29 +msgid "See application page at apps.owncloud.com" +msgstr "" + +#: templates/apps.php:30 +msgid "-licensed by " +msgstr "" + +#: templates/help.php:9 +msgid "Documentation" +msgstr "" + +#: templates/help.php:10 +msgid "Managing Big Files" +msgstr "" + +#: templates/help.php:11 +msgid "Ask a question" +msgstr "" + +#: templates/help.php:23 +msgid "Problems connecting to help database." +msgstr "" + +#: templates/help.php:24 +msgid "Go there manually." +msgstr "" + +#: templates/help.php:32 +msgid "Answer" +msgstr "" + +#: templates/personal.php:8 +msgid "You use" +msgstr "" + +#: templates/personal.php:8 +msgid "of the available" +msgstr "" + +#: templates/personal.php:12 +msgid "Desktop and Mobile Syncing Clients" +msgstr "" + +#: templates/personal.php:13 +msgid "Download" +msgstr "" + +#: templates/personal.php:19 +msgid "Your password got changed" +msgstr "" + +#: templates/personal.php:20 +msgid "Unable to change your password" +msgstr "" + +#: templates/personal.php:21 +msgid "Current password" +msgstr "" + +#: templates/personal.php:22 +msgid "New password" +msgstr "" + +#: templates/personal.php:23 +msgid "show" +msgstr "" + +#: templates/personal.php:24 +msgid "Change password" +msgstr "" + +#: templates/personal.php:30 +msgid "Email" +msgstr "" + +#: templates/personal.php:31 +msgid "Your email address" +msgstr "" + +#: templates/personal.php:32 +msgid "Fill in an email address to enable password recovery" +msgstr "" + +#: templates/personal.php:38 templates/personal.php:39 +msgid "Language" +msgstr "" + +#: templates/personal.php:44 +msgid "Help translate" +msgstr "" + +#: templates/personal.php:51 +msgid "use this address to connect to your ownCloud in your file manager" +msgstr "" + +#: templates/users.php:21 templates/users.php:76 +msgid "Name" +msgstr "" + +#: templates/users.php:23 templates/users.php:77 +msgid "Password" +msgstr "" + +#: templates/users.php:26 templates/users.php:78 templates/users.php:98 +msgid "Groups" +msgstr "" + +#: templates/users.php:32 +msgid "Create" +msgstr "" + +#: templates/users.php:35 +msgid "Default Quota" +msgstr "" + +#: templates/users.php:55 templates/users.php:138 +msgid "Other" +msgstr "" + +#: templates/users.php:80 templates/users.php:112 +msgid "Group Admin" +msgstr "" + +#: templates/users.php:82 +msgid "Quota" +msgstr "" + +#: templates/users.php:146 +msgid "Delete" +msgstr "" diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po new file mode 100644 index 0000000000..e4321202c2 --- /dev/null +++ b/l10n/oc/user_ldap.po @@ -0,0 +1,170 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: ownCloud\n" +"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-08-12 22:45+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: oc\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: templates/settings.php:8 +msgid "Host" +msgstr "" + +#: templates/settings.php:8 +msgid "" +"You can omit the protocol, except you require SSL. Then start with ldaps://" +msgstr "" + +#: templates/settings.php:9 +msgid "Base DN" +msgstr "" + +#: templates/settings.php:9 +msgid "You can specify Base DN for users and groups in the Advanced tab" +msgstr "" + +#: templates/settings.php:10 +msgid "User DN" +msgstr "" + +#: templates/settings.php:10 +msgid "" +"The DN of the client user with which the bind shall be done, e.g. " +"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password " +"empty." +msgstr "" + +#: templates/settings.php:11 +msgid "Password" +msgstr "" + +#: templates/settings.php:11 +msgid "For anonymous access, leave DN and Password empty." +msgstr "" + +#: templates/settings.php:12 +msgid "User Login Filter" +msgstr "" + +#: templates/settings.php:12 +#, php-format +msgid "" +"Defines the filter to apply, when login is attempted. %%uid replaces the " +"username in the login action." +msgstr "" + +#: templates/settings.php:12 +#, php-format +msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" +msgstr "" + +#: templates/settings.php:13 +msgid "User List Filter" +msgstr "" + +#: templates/settings.php:13 +msgid "Defines the filter to apply, when retrieving users." +msgstr "" + +#: templates/settings.php:13 +msgid "without any placeholder, e.g. \"objectClass=person\"." +msgstr "" + +#: templates/settings.php:14 +msgid "Group Filter" +msgstr "" + +#: templates/settings.php:14 +msgid "Defines the filter to apply, when retrieving groups." +msgstr "" + +#: templates/settings.php:14 +msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." +msgstr "" + +#: templates/settings.php:17 +msgid "Port" +msgstr "" + +#: templates/settings.php:18 +msgid "Base User Tree" +msgstr "" + +#: templates/settings.php:19 +msgid "Base Group Tree" +msgstr "" + +#: templates/settings.php:20 +msgid "Group-Member association" +msgstr "" + +#: templates/settings.php:21 +msgid "Use TLS" +msgstr "" + +#: templates/settings.php:21 +msgid "Do not use it for SSL connections, it will fail." +msgstr "" + +#: templates/settings.php:22 +msgid "Case insensitve LDAP server (Windows)" +msgstr "" + +#: templates/settings.php:23 +msgid "Turn off SSL certificate validation." +msgstr "" + +#: templates/settings.php:23 +msgid "" +"If connection only works with this option, import the LDAP server's SSL " +"certificate in your ownCloud server." +msgstr "" + +#: templates/settings.php:23 +msgid "Not recommended, use for testing only." +msgstr "" + +#: templates/settings.php:24 +msgid "User Display Name Field" +msgstr "" + +#: templates/settings.php:24 +msgid "The LDAP attribute to use to generate the user`s ownCloud name." +msgstr "" + +#: templates/settings.php:25 +msgid "Group Display Name Field" +msgstr "" + +#: templates/settings.php:25 +msgid "The LDAP attribute to use to generate the groups`s ownCloud name." +msgstr "" + +#: templates/settings.php:27 +msgid "in bytes" +msgstr "" + +#: templates/settings.php:29 +msgid "in seconds. A change empties the cache." +msgstr "" + +#: templates/settings.php:30 +msgid "" +"Leave empty for user name (default). Otherwise, specify an LDAP/AD " +"attribute." +msgstr "" + +#: templates/settings.php:32 +msgid "Help" +msgstr "" diff --git a/l10n/pl/files.po b/l10n/pl/files.po index a3ea40e9bd..2f0082e002 100644 --- a/l10n/pl/files.po +++ b/l10n/pl/files.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 13:42+0000\n" -"Last-Translator: Marcin Małecki \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +56,11 @@ msgstr "Błąd zapisu na dysk" msgid "Files" msgstr "Pliki" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Usuwa element" @@ -80,7 +84,7 @@ msgstr "anuluj" msgid "replaced" msgstr "zastąpione" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "wróć" @@ -88,7 +92,11 @@ msgstr "wróć" msgid "with" msgstr "z" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "skasuj" @@ -125,7 +133,7 @@ msgstr "Nieprawidłowa nazwa '/' jest niedozwolone." msgid "Size" msgstr "Rozmiar" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Czas modyfikacji" @@ -217,20 +225,20 @@ msgstr "Współdziel" msgid "Download" msgstr "Pobiera element" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "Wysyłany plik ma za duży rozmiar" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość." -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Skanowanie plików, proszę czekać." -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "Aktualnie skanowane" diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po index 227d04a1ec..6b1c826da5 100644 --- a/l10n/pl_PL/files.po +++ b/l10n/pl_PL/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -116,11 +124,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -196,36 +204,36 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po index 6e29f6321b..dba70ec6de 100644 --- a/l10n/pt_BR/files.po +++ b/l10n/pt_BR/files.po @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -56,7 +56,11 @@ msgstr "Falha ao escrever no disco" msgid "Files" msgstr "Arquivos" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Excluir" @@ -80,7 +84,7 @@ msgstr "cancelar" msgid "replaced" msgstr "substituido " -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "desfazer" @@ -88,7 +92,11 @@ msgstr "desfazer" msgid "with" msgstr "com" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "deletado" @@ -121,11 +129,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Nome inválido, '/' não é permitido." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Tamanho" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Modificado" @@ -201,36 +209,36 @@ msgstr "Carregar" msgid "Cancel upload" msgstr "Cancelar upload" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Nada aqui.Carrege alguma coisa!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nome" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Compartilhar" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Baixar" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Arquivo muito grande" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Arquivos sendo escaneados, por favor aguarde." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Scanning atual" diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po index c0ba21ecbc..874fc55cb8 100644 --- a/l10n/pt_PT/files.po +++ b/l10n/pt_PT/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,11 @@ msgstr "Falhou a escrita no disco" msgid "Files" msgstr "Ficheiros" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Apagar" @@ -78,7 +82,7 @@ msgstr "cancelar" msgid "replaced" msgstr "substituido" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "desfazer" @@ -86,7 +90,11 @@ msgstr "desfazer" msgid "with" msgstr "com" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "apagado" @@ -119,11 +127,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "nome inválido, '/' não permitido." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Tamanho" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Modificado" @@ -199,36 +207,36 @@ msgstr "Enviar" msgid "Cancel upload" msgstr "Cancelar upload" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Vazio. Envia alguma coisa!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nome" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Partilhar" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Transferir" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Envio muito grande" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envio neste servidor." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Os ficheiros estão a ser analisados, por favor aguarde." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Análise actual" diff --git a/l10n/ro/files.po b/l10n/ro/files.po index 84051830b4..a1551d7f5c 100644 --- a/l10n/ro/files.po +++ b/l10n/ro/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,11 @@ msgstr "Eroare la scriere pe disc" msgid "Files" msgstr "Fișiere" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Șterge" @@ -78,7 +82,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -86,7 +90,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -119,11 +127,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Dimensiune" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Modificat" @@ -199,36 +207,36 @@ msgstr "Încarcă" msgid "Cancel upload" msgstr "Anulează încărcarea" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Nimic aici. Încarcă ceva!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Nume" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Partajează" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Descarcă" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Fișierul încărcat este prea mare" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Fișierele sunt scanate, te rog așteptă." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "În curs de scanare" diff --git a/l10n/ru/core.po b/l10n/ru/core.po index fa6451a38b..303b4ff13f 100644 --- a/l10n/ru/core.po +++ b/l10n/ru/core.po @@ -7,13 +7,14 @@ # , 2011, 2012. # , 2011. # Victor Bravo <>, 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:02+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 10:55+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +34,7 @@ msgstr "Нет категорий для добавления?" msgid "This category already exists: " msgstr "Эта категория уже существует: " -#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61 +#: js/js.js:208 templates/layout.user.php:54 templates/layout.user.php:55 msgid "Settings" msgstr "Настройки" @@ -229,7 +230,7 @@ msgstr "Название базы данных" #: templates/installation.php:109 msgid "Database tablespace" -msgstr "" +msgstr "Табличое пространство базы данных" #: templates/installation.php:115 msgid "Database host" @@ -239,11 +240,11 @@ msgstr "Хост базы данных" msgid "Finish setup" msgstr "Завершить установку" -#: templates/layout.guest.php:42 +#: templates/layout.guest.php:36 msgid "web services under your control" msgstr "Сетевые службы под твоим контролем" -#: templates/layout.user.php:45 +#: templates/layout.user.php:39 msgid "Log out" msgstr "Выйти" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index 250d6badf4..6d0f5f2024 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.po @@ -9,12 +9,13 @@ # Nick Remeslennikov , 2012. # , 2011. # Victor Bravo <>, 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -57,7 +58,11 @@ msgstr "Ошибка записи на диск" msgid "Files" msgstr "Файлы" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Удалить" @@ -71,7 +76,7 @@ msgstr "заменить" #: js/filelist.js:186 msgid "suggest name" -msgstr "" +msgstr "предложить название" #: js/filelist.js:186 js/filelist.js:188 msgid "cancel" @@ -81,7 +86,7 @@ msgstr "отмена" msgid "replaced" msgstr "заменён" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "отмена" @@ -89,7 +94,11 @@ msgstr "отмена" msgid "with" msgstr "с" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "удален" @@ -122,11 +131,11 @@ msgstr "Файл в процессе загрузки. Покинув стран msgid "Invalid name, '/' is not allowed." msgstr "Неверное имя, '/' не допускается." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Размер" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Изменён" @@ -176,7 +185,7 @@ msgstr "Максимальный исходный размер для ZIP фай #: templates/admin.php:14 msgid "Save" -msgstr "" +msgstr "Сохранить" #: templates/index.php:7 msgid "New" @@ -202,36 +211,36 @@ msgstr "Загрузить" msgid "Cancel upload" msgstr "Отмена загрузки" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Здесь ничего нет. Загрузите что-нибудь!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Название" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Опубликовать" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Скачать" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Файл слишком большой" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Подождите, файлы сканируются." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Текущее сканирование" diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po index fc36a2ead4..4eec64b43e 100644 --- a/l10n/ru/files_versions.po +++ b/l10n/ru/files_versions.po @@ -4,19 +4,20 @@ # # Translators: # Denis , 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-01 13:35+0200\n" -"PO-Revision-Date: 2012-09-01 11:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 11:40+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: 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" #: js/settings-personal.js:31 templates/settings-personal.php:10 msgid "Expire all versions" @@ -24,11 +25,11 @@ 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 "Enable Files Versioning" diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po index 9a75b9546a..da6e478500 100644 --- a/l10n/ru/lib.po +++ b/l10n/ru/lib.po @@ -5,41 +5,42 @@ # Translators: # Denis , 2012. # , 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-03 02:04+0200\n" -"PO-Revision-Date: 2012-09-02 14:32+0000\n" -"Last-Translator: mPolr \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 11:22+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: 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 "Помощь" -#: 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 "Admin" @@ -71,56 +72,56 @@ msgstr "Ошибка аутентификации" msgid "Token expired. Please reload page." 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 more information" -msgstr "" +msgstr "Возможно обновление до %s. Подробнее" #: updater.php:68 msgid "up to date" -msgstr "" +msgstr "актуальная версия" #: updater.php:71 msgid "updates check is disabled" diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po index 3d22b6c936..441a2de6ae 100644 --- a/l10n/ru_RU/files.po +++ b/l10n/ru_RU/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -116,11 +124,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -196,36 +204,36 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po index e47f0b0088..a9285f4547 100644 --- a/l10n/sk_SK/files.po +++ b/l10n/sk_SK/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "Zápis na disk sa nepodaril" msgid "Files" msgstr "Súbory" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Odstrániť" @@ -77,7 +81,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -85,7 +89,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -118,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Chybný názov, \"/\" nie je povolené" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Veľkosť" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Upravené" @@ -198,36 +206,36 @@ msgstr "Nahrať" msgid "Cancel upload" msgstr "Zrušiť odosielanie" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Nič tu nie je. Nahrajte niečo!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Meno" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Zdielať" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Stiahnuť" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Nahrávanie príliš veľké" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Súbory sa práve prehľadávajú, prosím čakajte." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Práve prehliadané" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index af1cffc01a..419db6b3fa 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.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-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 05:16+0000\n" -"Last-Translator: Peter Peroša \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +54,11 @@ msgstr "Pisanje na disk je spodletelo" msgid "Files" msgstr "Datoteke" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Izbriši" @@ -78,7 +82,7 @@ msgstr "ekliči" msgid "replaced" msgstr "nadomeščen" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "razveljavi" @@ -86,7 +90,11 @@ msgstr "razveljavi" msgid "with" msgstr "z" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "izbrisano" @@ -123,7 +131,7 @@ msgstr "Neveljavno ime. Znak '/' ni dovoljen." msgid "Size" msgstr "Velikost" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Spremenjeno" @@ -215,20 +223,20 @@ msgstr "Souporaba" msgid "Download" msgstr "Prenesi" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "Nalaganje ni mogoče, ker je preveliko" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku." -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Preiskujem datoteke, prosimo počakajte." -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "Trenutno preiskujem" diff --git a/l10n/so/files.po b/l10n/so/files.po index a00a9a156c..f168f0b775 100644 --- a/l10n/so/files.po +++ b/l10n/so/files.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Somali (http://www.transifex.com/projects/p/owncloud/language/so/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -116,11 +124,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -196,36 +204,36 @@ msgstr "" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/sr/files.po b/l10n/sr/files.po index 8dac0a4264..8874f6a4db 100644 --- a/l10n/sr/files.po +++ b/l10n/sr/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,11 @@ msgstr "" msgid "Files" msgstr "Фајлови" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Обриши" @@ -76,7 +80,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -84,7 +88,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -117,11 +125,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Величина" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Задња измена" @@ -197,36 +205,36 @@ msgstr "Пошаљи" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Овде нема ничег. Пошаљите нешто!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Име" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Преузми" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Пошиљка је превелика" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Фајлови које желите да пошаљете превазилазе ограничење максималне величине пошиљке на овом серверу." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po index e52820431e..11f37da7d1 100644 --- a/l10n/sr@latin/files.po +++ b/l10n/sr@latin/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,11 @@ msgstr "" msgid "Files" msgstr "Fajlovi" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Obriši" @@ -76,7 +80,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -84,7 +88,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -117,11 +125,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Veličina" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Zadnja izmena" @@ -197,36 +205,36 @@ msgstr "Pošalji" msgid "Cancel upload" msgstr "" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Ovde nema ničeg. Pošaljite nešto!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Ime" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Preuzmi" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Pošiljka je prevelika" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/sv/files.po b/l10n/sv/files.po index 81ea65ce48..c9508d5b64 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.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-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 13:34+0000\n" -"Last-Translator: Magnus Höglund \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \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" @@ -57,7 +57,11 @@ msgstr "Misslyckades spara till disk" msgid "Files" msgstr "Filer" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Radera" @@ -81,7 +85,7 @@ msgstr "avbryt" msgid "replaced" msgstr "ersatt" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "ångra" @@ -89,7 +93,11 @@ msgstr "ångra" msgid "with" msgstr "med" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "raderad" @@ -126,7 +134,7 @@ msgstr "Ogiltigt namn, '/' är inte tillåten." msgid "Size" msgstr "Storlek" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Ändrad" @@ -218,20 +226,20 @@ msgstr "Dela" msgid "Download" msgstr "Ladda ner" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "För stor uppladdning" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern." -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Filer skannas, var god vänta" -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "Aktuell skanning" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index b702651ccd..c74b265889 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-07 02:04+0200\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ msgstr "" msgid "This category already exists: " msgstr "" -#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61 +#: js/js.js:208 templates/layout.user.php:54 templates/layout.user.php:55 msgid "Settings" msgstr "" @@ -235,11 +235,11 @@ msgstr "" msgid "Finish setup" msgstr "" -#: templates/layout.guest.php:42 +#: templates/layout.guest.php:36 msgid "web services under your control" msgstr "" -#: templates/layout.user.php:45 +#: templates/layout.user.php:39 msgid "Log out" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 08fbebab79..e97ace3f33 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-07 02:04+0200\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -51,7 +51,11 @@ msgstr "" msgid "Files" msgstr "" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "" @@ -75,7 +79,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -83,7 +87,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -120,7 +128,7 @@ msgstr "" msgid "Size" msgstr "" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "" @@ -212,20 +220,20 @@ msgstr "" msgid "Download" msgstr "" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "" -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "" -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 372d9301ed..7e2709f019 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-07 02:04+0200\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index d09f705535..311891242c 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-07 02:04+0200\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index e9f6afc98d..9f4a05645a 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-07 02:04+0200\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 9750a4acc5..a8efc666c9 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-07 02:04+0200\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index d9c9f8aade..41dc540143 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-07 02:04+0200\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,27 +17,27 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\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 "" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 8bd0ab8fda..ce3a92f62a 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-07 02:04+0200\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 45eb19bf9f..7283addbb6 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-07 02:04+0200\n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index 7c73207131..021f82d452 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/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-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 04:45+0000\n" -"Last-Translator: AriesAnywhere Anywhere \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \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" @@ -53,7 +53,11 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้ msgid "Files" msgstr "ไฟล์" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "ลบ" @@ -77,7 +81,7 @@ msgstr "ยกเลิก" msgid "replaced" msgstr "แทนที่แล้ว" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "เลิกทำ" @@ -85,7 +89,11 @@ msgstr "เลิกทำ" msgid "with" msgstr "กับ" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "ลบแล้ว" @@ -122,7 +130,7 @@ msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม msgid "Size" msgstr "ขนาด" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "ปรับปรุงล่าสุด" @@ -214,20 +222,20 @@ msgstr "แชร์" msgid "Download" msgstr "ดาวน์โหลด" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้" -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่." -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้" diff --git a/l10n/tr/files.po b/l10n/tr/files.po index 01675ca064..c0a9c6b876 100644 --- a/l10n/tr/files.po +++ b/l10n/tr/files.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n" "MIME-Version: 1.0\n" @@ -55,7 +55,11 @@ msgstr "Diske yazılamadı" msgid "Files" msgstr "Dosyalar" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Sil" @@ -79,7 +83,7 @@ msgstr "iptal" msgid "replaced" msgstr "değiştirildi" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "geri al" @@ -87,7 +91,11 @@ msgstr "geri al" msgid "with" msgstr "ile" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "silindi" @@ -120,11 +128,11 @@ msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işlem msgid "Invalid name, '/' is not allowed." msgstr "Geçersiz isim, '/' işaretine izin verilmiyor." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Boyut" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Değiştirilme" @@ -200,36 +208,36 @@ msgstr "Yükle" msgid "Cancel upload" msgstr "Yüklemeyi iptal et" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Ad" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Paylaş" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "İndir" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Yüklemeniz çok büyük" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Dosyalar taranıyor, lütfen bekleyin." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Güncel tarama" diff --git a/l10n/uk/files.po b/l10n/uk/files.po index 558899c1a2..f81ff99674 100644 --- a/l10n/uk/files.po +++ b/l10n/uk/files.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" @@ -53,7 +53,11 @@ msgstr "" msgid "Files" msgstr "Файли" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Видалити" @@ -77,7 +81,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "відмінити" @@ -85,7 +89,11 @@ msgstr "відмінити" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "видалені" @@ -118,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Некоректне ім'я, '/' не дозволено." -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Розмір" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Змінено" @@ -198,36 +206,36 @@ msgstr "Відвантажити" msgid "Cancel upload" msgstr "Перервати завантаження" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Тут нічого немає. Відвантажте що-небудь!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Ім'я" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Поділитися" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Завантажити" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "Файл занадто великий" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Файли скануються, зачекайте, будь-ласка." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "Поточне сканування" diff --git a/l10n/vi/files.po b/l10n/vi/files.po index fb95389e33..e6cb256217 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/files.po @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # Sơn Nguyễn , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" @@ -20,7 +21,7 @@ msgstr "" #: ajax/upload.php:20 msgid "There is no error, the file uploaded with success" -msgstr "" +msgstr "Không có lỗi, các tập tin đã được tải lên thành công" #: ajax/upload.php:21 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini" @@ -52,7 +53,11 @@ msgstr "" msgid "Files" msgstr "Tập tin" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "Xóa" @@ -76,7 +81,7 @@ msgstr "" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -84,7 +89,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -117,11 +126,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "Tên không hợp lệ ,không được phép dùng '/'" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "Kích cỡ" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "Thay đổi" @@ -197,36 +206,36 @@ msgstr "Tải lên" msgid "Cancel upload" msgstr "Hủy upload" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "Không có gì ở đây .Hãy tải lên một cái gì đó !" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "Tên" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "Chia sẻ" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "Tải xuống" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "File tải lên quá lớn" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." -msgstr "" +msgstr "Các tập tin bạn đang cố gắng tải lên vượt quá kích thước tối đa cho phép trên máy chủ này." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "Tập tin đang được quét ,vui lòng chờ." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "" diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po index d76c619333..9c55fc8c75 100644 --- a/l10n/vi/files_encryption.po +++ b/l10n/vi/files_encryption.po @@ -3,32 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Sơn Nguyễn , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-13 23:12+0200\n" -"PO-Revision-Date: 2012-08-12 22:33+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-07 14:56+0000\n" +"Last-Translator: Sơn Nguyễn \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:3 msgid "Encryption" -msgstr "" +msgstr "Mã hóa" #: templates/settings.php:4 msgid "Exclude the following file types from encryption" -msgstr "" +msgstr "Loại trừ các loại tập tin sau đây từ mã hóa" #: templates/settings.php:5 msgid "None" -msgstr "" +msgstr "none" #: templates/settings.php:10 msgid "Enable Encryption" -msgstr "" +msgstr "BẬT mã hóa" diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po index 8633bedfa5..d91134daff 100644 --- a/l10n/vi/files_external.po +++ b/l10n/vi/files_external.po @@ -3,80 +3,81 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Sơn Nguyễn , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-13 23:12+0200\n" -"PO-Revision-Date: 2012-08-12 22:34+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 15:39+0000\n" +"Last-Translator: Sơn Nguyễn \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:3 msgid "External Storage" -msgstr "" +msgstr "Lưu trữ ngoài" #: templates/settings.php:7 templates/settings.php:19 msgid "Mount point" -msgstr "" +msgstr "Điểm gắn" #: templates/settings.php:8 msgid "Backend" -msgstr "" +msgstr "phụ trợ" #: templates/settings.php:9 msgid "Configuration" -msgstr "" +msgstr "Cấu hình" #: templates/settings.php:10 msgid "Options" -msgstr "" +msgstr "Tùy chọn" #: templates/settings.php:11 msgid "Applicable" -msgstr "" +msgstr "Áp dụng" #: templates/settings.php:23 msgid "Add mount point" -msgstr "" +msgstr "Thêm điểm lắp" #: templates/settings.php:54 templates/settings.php:62 msgid "None set" -msgstr "" +msgstr "không" #: templates/settings.php:63 msgid "All Users" -msgstr "" +msgstr "Tất cả người dùng" #: templates/settings.php:64 msgid "Groups" -msgstr "" +msgstr "Nhóm" #: templates/settings.php:69 msgid "Users" -msgstr "" +msgstr "Người dùng" #: templates/settings.php:77 templates/settings.php:96 msgid "Delete" -msgstr "" +msgstr "Xóa" #: templates/settings.php:88 msgid "SSL root certificates" -msgstr "" +msgstr "Chứng chỉ SSL root" #: templates/settings.php:102 msgid "Import Root Certificate" -msgstr "" +msgstr "Nhập Root Certificate" #: templates/settings.php:108 msgid "Enable User External Storage" -msgstr "" +msgstr "Kích hoạt tính năng lưu trữ ngoài" #: templates/settings.php:109 msgid "Allow users to mount their own external storage" -msgstr "" +msgstr "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài của họ" diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po index a3aaf62a3e..fd39b546fd 100644 --- a/l10n/vi/files_sharing.po +++ b/l10n/vi/files_sharing.po @@ -3,36 +3,37 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Sơn Nguyễn , 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 \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 14:58+0000\n" +"Last-Translator: Sơn Nguyễn \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "Mật khẩu" #: templates/authenticate.php:6 msgid "Submit" -msgstr "" +msgstr "Xác nhận" #: templates/public.php:9 templates/public.php:19 msgid "Download" -msgstr "" +msgstr "Tải về" #: templates/public.php:18 msgid "No preview available for" -msgstr "" +msgstr "Không có xem trước cho" -#: templates/public.php:23 +#: templates/public.php:25 msgid "web services under your control" -msgstr "" +msgstr "dịch vụ web dưới sự kiểm soát của bạn" diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po index 54f38f2812..9a03e55a3b 100644 --- a/l10n/vi/files_versions.po +++ b/l10n/vi/files_versions.po @@ -3,32 +3,33 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Sơn Nguyễn , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-01 13:35+0200\n" -"PO-Revision-Date: 2012-09-01 11:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 14:50+0000\n" +"Last-Translator: Sơn Nguyễn \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: js/settings-personal.js:31 templates/settings-personal.php:10 msgid "Expire all versions" -msgstr "" +msgstr "Hết hạn tất cả các phiên bản" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "Phiên bản" #: templates/settings-personal.php:7 msgid "This will delete all existing backup versions of your files" -msgstr "" +msgstr "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có " #: templates/settings.php:3 msgid "Enable Files Versioning" -msgstr "" +msgstr "BẬT tập tin phiên bản" diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po index 966ae22706..23d2427771 100644 --- a/l10n/vi/lib.po +++ b/l10n/vi/lib.po @@ -3,123 +3,124 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Sơn Nguyễn , 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 \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 14:09+0000\n" +"Last-Translator: Sơn Nguyễn \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" -#: app.php:288 +#: app.php:285 msgid "Help" -msgstr "" +msgstr "Giúp đỡ" -#: app.php:295 +#: app.php:292 msgid "Personal" -msgstr "" +msgstr "Cá nhân" -#: app.php:300 +#: app.php:297 msgid "Settings" -msgstr "" +msgstr "Cài đặt" -#: app.php:305 +#: app.php:302 msgid "Users" -msgstr "" +msgstr "Người dùng" -#: app.php:312 +#: app.php:309 msgid "Apps" -msgstr "" +msgstr "Ứng dụng" -#: app.php:314 +#: app.php:311 msgid "Admin" -msgstr "" +msgstr "Quản trị" #: files.php:280 msgid "ZIP download is turned off." -msgstr "" +msgstr "Tải về ZIP đã bị tắt." #: files.php:281 msgid "Files need to be downloaded one by one." -msgstr "" +msgstr "Tập tin cần phải được tải về từng người một." #: files.php:281 files.php:306 msgid "Back to Files" -msgstr "" +msgstr "Trở lại tập tin" #: files.php:305 msgid "Selected files too large to generate zip file." -msgstr "" +msgstr "Tập tin được chọn quá lớn để tạo tập tin ZIP." #: json.php:28 msgid "Application is not enabled" -msgstr "" +msgstr "Ứng dụng không được BẬT" #: json.php:39 json.php:63 json.php:75 msgid "Authentication error" -msgstr "" +msgstr "Lỗi xác thực" #: json.php:51 msgid "Token expired. Please reload page." -msgstr "" - -#: template.php:86 -msgid "seconds ago" -msgstr "" +msgstr "Mã Token đã hết hạn. Hãy tải lại trang." #: template.php:87 -msgid "1 minute ago" -msgstr "" +msgid "seconds ago" +msgstr "1 giây trước" #: template.php:88 +msgid "1 minute ago" +msgstr "1 phút trước" + +#: template.php:89 #, php-format msgid "%d minutes ago" -msgstr "" - -#: template.php:91 -msgid "today" -msgstr "" +msgstr "%d phút trước" #: template.php:92 -msgid "yesterday" -msgstr "" +msgid "today" +msgstr "hôm nay" #: template.php:93 -#, php-format -msgid "%d days ago" -msgstr "" +msgid "yesterday" +msgstr "hôm qua" #: template.php:94 -msgid "last month" -msgstr "" +#, php-format +msgid "%d days ago" +msgstr "%d ngày trước" #: template.php:95 -msgid "months ago" -msgstr "" +msgid "last month" +msgstr "tháng trước" #: template.php:96 -msgid "last year" -msgstr "" +msgid "months ago" +msgstr "tháng trước" #: template.php:97 +msgid "last year" +msgstr "năm trước" + +#: template.php:98 msgid "years ago" -msgstr "" +msgstr "năm trước" #: updater.php:66 #, php-format msgid "%s is available. Get more information" -msgstr "" +msgstr "%s có sẵn. xem thêm ở đây" #: updater.php:68 msgid "up to date" -msgstr "" +msgstr "đến ngày" #: updater.php:71 msgid "updates check is disabled" -msgstr "" +msgstr "đã TĂT chức năng cập nhật " diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po index b8c57b3723..12a6254703 100644 --- a/l10n/vi/settings.po +++ b/l10n/vi/settings.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. # Son Nguyen , 2012. # Sơn Nguyễn , 2012. # , 2012. @@ -10,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-05 02:02+0200\n" -"PO-Revision-Date: 2012-09-05 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-08 02:02+0200\n" +"PO-Revision-Date: 2012-09-07 16:01+0000\n" +"Last-Translator: mattheu_9x \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,11 +32,11 @@ msgstr "Lỗi xác thực" #: ajax/creategroup.php:19 msgid "Group already exists" -msgstr "" +msgstr "Nhóm đã tồn tại" #: ajax/creategroup.php:28 msgid "Unable to add group" -msgstr "" +msgstr "Không thể thêm nhóm" #: ajax/lostpassword.php:14 msgid "Email saved" @@ -55,11 +56,11 @@ msgstr "Yêu cầu không hợp lệ" #: ajax/removegroup.php:16 msgid "Unable to delete group" -msgstr "" +msgstr "Không thể xóa nhóm" #: ajax/removeuser.php:22 msgid "Unable to delete user" -msgstr "" +msgstr "Không thể xóa người dùng" #: ajax/setlanguage.php:18 msgid "Language changed" @@ -68,12 +69,12 @@ msgstr "Ngôn ngữ đã được thay đổi" #: ajax/togglegroups.php:25 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "Không thể thêm người dùng vào nhóm %s" #: ajax/togglegroups.php:31 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "Không thể xóa người dùng từ nhóm %s" #: js/apps.js:18 msgid "Error" @@ -106,59 +107,59 @@ msgid "" "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." -msgstr "" +msgstr "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ." #: templates/admin.php:31 msgid "Cron" -msgstr "" +msgstr "Cron" #: templates/admin.php:33 msgid "execute one task with each page loaded" -msgstr "" +msgstr "Thực thi một nhiệm vụ với mỗi trang được nạp" #: templates/admin.php:35 msgid "cron.php is registered at a webcron service" -msgstr "" +msgstr "cron.php đã được đăng ký ở một dịch vụ webcron" #: templates/admin.php:37 msgid "use systems cron service" -msgstr "" +msgstr "sử dụng hệ thống dịch vụ cron" #: templates/admin.php:41 msgid "Share API" -msgstr "" +msgstr "Chia sẻ API" #: templates/admin.php:46 msgid "Enable Share API" -msgstr "" +msgstr "Bật chia sẻ API" #: templates/admin.php:47 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Cho phép các ứng dụng sử dụng chia sẻ API" #: templates/admin.php:51 msgid "Allow links" -msgstr "" +msgstr "Cho phép liên kết" #: templates/admin.php:52 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết" #: templates/admin.php:56 msgid "Allow resharing" -msgstr "" +msgstr "Cho phép chia sẻ lại" #: templates/admin.php:57 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ" #: templates/admin.php:60 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Cho phép người dùng chia sẻ với bất cứ ai" #: templates/admin.php:62 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ" #: templates/admin.php:69 msgid "Log" @@ -176,7 +177,7 @@ msgid "" "licensed under the AGPL." -msgstr "" +msgstr "Được phát triển bởi cộng đồng ownCloud, mã nguồn đã được cấp phép theo chuẩn AGPL." #: templates/apps.php:10 msgid "Add your App" @@ -192,7 +193,7 @@ msgstr "Xem ứng dụng tại apps.owncloud.com" #: templates/apps.php:30 msgid "-licensed by " -msgstr "" +msgstr "-Giấy phép được cấp bởi " #: templates/help.php:9 msgid "Documentation" @@ -308,7 +309,7 @@ msgstr "Khác" #: templates/users.php:80 templates/users.php:112 msgid "Group Admin" -msgstr "" +msgstr "Nhóm quản trị" #: templates/users.php:82 msgid "Quota" diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po index 3224b4b01d..27fb4d0b39 100644 --- a/l10n/zh_CN.GB2312/files.po +++ b/l10n/zh_CN.GB2312/files.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n" "MIME-Version: 1.0\n" @@ -52,7 +52,11 @@ msgstr "写磁盘失败" msgid "Files" msgstr "文件" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "删除" @@ -76,7 +80,7 @@ msgstr "取消" msgid "replaced" msgstr "替换过了" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "撤销" @@ -84,7 +88,11 @@ msgstr "撤销" msgid "with" msgstr "随着" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "删除" @@ -117,11 +125,11 @@ msgstr "" msgid "Invalid name, '/' is not allowed." msgstr "非法文件名,\"/\"是不被许可的" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "大小" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "修改日期" @@ -197,36 +205,36 @@ msgstr "上传" msgid "Cancel upload" msgstr "取消上传" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "这里没有东西.上传点什么!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "名字" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "分享" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "下载" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "上传的文件太大了" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "你正在试图上传的文件超过了此服务器支持的最大的文件大小." -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "正在扫描文件,请稍候." -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "正在扫描" diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po index 585310a408..a7489a4246 100644 --- a/l10n/zh_CN/files.po +++ b/l10n/zh_CN/files.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-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 07:31+0000\n" -"Last-Translator: hanfeng \n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"Last-Translator: I Robot \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" @@ -54,7 +54,11 @@ msgstr "写入磁盘失败" msgid "Files" msgstr "文件" -#: js/fileactions.js:106 templates/index.php:57 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "删除" @@ -78,7 +82,7 @@ msgstr "取消" msgid "replaced" msgstr "已经替换" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "撤销" @@ -86,7 +90,11 @@ msgstr "撤销" msgid "with" msgstr "随着" -#: js/filelist.js:266 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "已经删除" @@ -123,7 +131,7 @@ msgstr "非法的名称，不允许使用‘/’。" msgid "Size" msgstr "大小" -#: js/files.js:747 templates/index.php:57 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "修改日期" @@ -215,20 +223,20 @@ msgstr "共享" msgid "Download" msgstr "下载" -#: templates/index.php:65 +#: templates/index.php:75 msgid "Upload too large" msgstr "上传文件过大" -#: templates/index.php:67 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "您正尝试上传的文件超过了此服务器可以上传的最大大小" -#: templates/index.php:72 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "文件正在被扫描，请稍候。" -#: templates/index.php:75 +#: templates/index.php:85 msgid "Current scanning" msgstr "当前扫描" diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po index 7e030749cf..502f4e08a6 100644 --- a/l10n/zh_CN/files_encryption.po +++ b/l10n/zh_CN/files_encryption.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-07 02:04+0200\n" -"PO-Revision-Date: 2012-09-06 15:39+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-07 09:38+0000\n" "Last-Translator: hanfeng \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "加密" #: templates/settings.php:4 msgid "Exclude the following file types from encryption" -msgstr "" +msgstr "从加密中排除列出的文件类型" #: templates/settings.php:5 msgid "None" diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po index ac4a772abd..b4564768b7 100644 --- a/l10n/zh_TW/files.po +++ b/l10n/zh_TW/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:01+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" +"POT-Creation-Date: 2012-09-08 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 00:02+0000\n" "Last-Translator: I Robot \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -54,7 +54,11 @@ msgstr "寫入硬碟失敗" msgid "Files" msgstr "檔案" -#: js/fileactions.js:106 templates/index.php:56 +#: js/fileactions.js:108 templates/index.php:62 +msgid "Unshare" +msgstr "" + +#: js/fileactions.js:110 templates/index.php:64 msgid "Delete" msgstr "刪除" @@ -78,7 +82,7 @@ msgstr "取消" msgid "replaced" msgstr "" -#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271 +#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" msgstr "" @@ -86,7 +90,11 @@ msgstr "" msgid "with" msgstr "" -#: js/filelist.js:271 +#: js/filelist.js:268 +msgid "unshared" +msgstr "" + +#: js/filelist.js:270 msgid "deleted" msgstr "" @@ -119,11 +127,11 @@ msgstr "檔案上傳中. 離開此頁面將會取消上傳." msgid "Invalid name, '/' is not allowed." msgstr "無效的名稱, '/'是不被允許的" -#: js/files.js:746 templates/index.php:55 +#: js/files.js:746 templates/index.php:56 msgid "Size" msgstr "大小" -#: js/files.js:747 templates/index.php:56 +#: js/files.js:747 templates/index.php:58 msgid "Modified" msgstr "修改" @@ -199,36 +207,36 @@ msgstr "上傳" msgid "Cancel upload" msgstr "取消上傳" -#: templates/index.php:39 +#: templates/index.php:40 msgid "Nothing in here. Upload something!" msgstr "沒有任何東西。請上傳內容!" -#: templates/index.php:47 +#: templates/index.php:48 msgid "Name" msgstr "名稱" -#: templates/index.php:49 +#: templates/index.php:50 msgid "Share" msgstr "分享" -#: templates/index.php:51 +#: templates/index.php:52 msgid "Download" msgstr "下載" -#: templates/index.php:64 +#: templates/index.php:75 msgid "Upload too large" msgstr "上傳過大" -#: templates/index.php:66 +#: templates/index.php:77 msgid "" "The files you are trying to upload exceed the maximum size for file uploads " "on this server." msgstr "你試圖上傳的檔案已超過伺服器的最大容量限制。　" -#: templates/index.php:71 +#: templates/index.php:82 msgid "Files are being scanned, please wait." msgstr "正在掃描檔案，請稍等。" -#: templates/index.php:74 +#: templates/index.php:85 msgid "Current scanning" msgstr "目前掃描" diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index 3b2681ba8d..74425f0e13 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -22,5 +22,7 @@ "months ago" => "месяцы назад", "last year" => "в прошлом году", "years ago" => "годы назад", +"%s is available. Get more information" => "Возможно обновление до %s. Подробнее", +"up to date" => "актуальная версия", "updates check is disabled" => "проверка обновлений отключена" ); diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php new file mode 100644 index 0000000000..fc41d69819 --- /dev/null +++ b/lib/l10n/vi.php @@ -0,0 +1,28 @@ + "Giúp đỡ", +"Personal" => "Cá nhân", +"Settings" => "Cài đặt", +"Users" => "Người dùng", +"Apps" => "Ứng dụng", +"Admin" => "Quản trị", +"ZIP download is turned off." => "Tải về ZIP đã bị tắt.", +"Files need to be downloaded one by one." => "Tập tin cần phải được tải về từng người một.", +"Back to Files" => "Trở lại tập tin", +"Selected files too large to generate zip file." => "Tập tin được chọn quá lớn để tạo tập tin ZIP.", +"Application is not enabled" => "Ứng dụng không được BẬT", +"Authentication error" => "Lỗi xác thực", +"Token expired. Please reload page." => "Mã Token đã hết hạn. Hãy tải lại trang.", +"seconds ago" => "1 giây trước", +"1 minute ago" => "1 phút trước", +"%d minutes ago" => "%d phút trước", +"today" => "hôm nay", +"yesterday" => "hôm qua", +"%d days ago" => "%d ngày trước", +"last month" => "tháng trước", +"months ago" => "tháng trước", +"last year" => "năm trước", +"years ago" => "năm trước", +"%s is available. Get more information" => "%s có sẵn. xem thêm ở đây", +"up to date" => "đến ngày", +"updates check is disabled" => "đã TĂT chức năng cập nhật " +); diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php index 4c95c7e471..a30382f030 100644 --- a/settings/l10n/eu.php +++ b/settings/l10n/eu.php @@ -1,11 +1,17 @@ "Ezin izan da App Dendatik zerrenda kargatu", "Authentication error" => "Autentifikazio errorea", +"Group already exists" => "Taldea dagoeneko existitzenda", +"Unable to add group" => "Ezin izan da taldea gehitu", "Email saved" => "Eposta gorde da", "Invalid email" => "Baliogabeko eposta", "OpenID Changed" => "OpenID aldatuta", "Invalid request" => "Baliogabeko eskaria", +"Unable to delete group" => "Ezin izan da taldea ezabatu", +"Unable to delete user" => "Ezin izan da erabiltzailea ezabatu", "Language changed" => "Hizkuntza aldatuta", +"Unable to add user to group %s" => "Ezin izan da erabiltzailea %s taldera gehitu", +"Unable to remove user from group %s" => "Ezin izan da erabiltzailea %s taldetik ezabatu", "Error" => "Errorea", "Disable" => "Ez-gaitu", "Enable" => "Gaitu", @@ -32,6 +38,7 @@ "Add your App" => "Gehitu zure aplikazioa", "Select an App" => "Aukeratu programa bat", "See application page at apps.owncloud.com" => "Ikusi programen orria apps.owncloud.com en", +"-licensed by " => "-lizentziatua ", "Documentation" => "Dokumentazioa", "Managing Big Files" => "Fitxategi handien kudeaketa", "Ask a question" => "Egin galdera bat", diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php index 5957f6282f..8ac7b58a4c 100644 --- a/settings/l10n/nl.php +++ b/settings/l10n/nl.php @@ -18,6 +18,7 @@ "Saving..." => "Aan het bewaren.....", "__language_name__" => "Nederlands", "Security Warning" => "Veiligheidswaarschuwing", +"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", "execute one task with each page loaded" => "Voer 1 taak uit bij elke geladen pagina", "cron.php is registered at a webcron service" => "cron.php is geregistreerd bij een webcron service", diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php index 1cad2e148d..c410bb4c3d 100644 --- a/settings/l10n/vi.php +++ b/settings/l10n/vi.php @@ -1,22 +1,44 @@ "Không thể tải danh sách ứng dụng từ App Store", "Authentication error" => "Lỗi xác thực", +"Group already exists" => "Nhóm đã tồn tại", +"Unable to add group" => "Không thể thêm nhóm", "Email saved" => "Lưu email", "Invalid email" => "Email không hợp lệ", "OpenID Changed" => "Đổi OpenID", "Invalid request" => "Yêu cầu không hợp lệ", +"Unable to delete group" => "Không thể xóa nhóm", +"Unable to delete user" => "Không thể xóa người dùng", "Language changed" => "Ngôn ngữ đã được thay đổi", +"Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s", +"Unable to remove user from group %s" => "Không thể xóa người dùng từ nhóm %s", "Error" => "Lỗi", "Disable" => "Vô hiệu", "Enable" => "Cho phép", "Saving..." => "Đang tiến hành lưu ...", "__language_name__" => "__Ngôn ngữ___", "Security Warning" => "Cảnh bảo bảo mật", +"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." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.", +"Cron" => "Cron", +"execute one task with each page loaded" => "Thực thi một nhiệm vụ với mỗi trang được nạp", +"cron.php is registered at a webcron service" => "cron.php đã được đăng ký ở một dịch vụ webcron", +"use systems cron service" => "sử dụng hệ thống dịch vụ cron", +"Share API" => "Chia sẻ API", +"Enable Share API" => "Bật chia sẻ API", +"Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API", +"Allow links" => "Cho phép liên kết", +"Allow users to share items to the public with links" => "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết", +"Allow resharing" => "Cho phép chia sẻ lại", +"Allow users to share items shared with them again" => "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ", +"Allow users to share with anyone" => "Cho phép người dùng chia sẻ với bất cứ ai", +"Allow users to only share with users in their groups" => "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ", "Log" => "Log", "More" => "nhiều hơn", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Được phát triển bởi cộng đồng ownCloud, mã nguồn đã được cấp phép theo chuẩn AGPL.", "Add your App" => "Thêm ứng dụng của bạn", "Select an App" => "Chọn một ứng dụng", "See application page at apps.owncloud.com" => "Xem ứng dụng tại apps.owncloud.com", +"-licensed by " => "-Giấy phép được cấp bởi ", "Documentation" => "Tài liệu", "Managing Big Files" => "Quản lý tập tin lớn", "Ask a question" => "Đặt câu hỏi", @@ -45,6 +67,7 @@ "Create" => "Tạo", "Default Quota" => "Hạn ngạch mặt định", "Other" => "Khác", +"Group Admin" => "Nhóm quản trị", "Quota" => "Hạn ngạch", "Delete" => "Xóa" ); From c692dfc1ab2d1267827c3e973ce126f6c0367297 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sat, 8 Sep 2012 15:52:29 +0200 Subject: [PATCH 005/205] style fixes for public app api --- lib/public/app.php | 205 +++++++++++++++++++++------------------------ 1 file changed, 97 insertions(+), 108 deletions(-) diff --git a/lib/public/app.php b/lib/public/app.php index eb824f043e..acb401a1d3 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -34,120 +34,109 @@ namespace OCP; * This class provides functions to manage apps in ownCloud */ class App { - /** - * @brief Makes owncloud aware of this app - * @brief This call is deprecated and not necessary to use. - * @param $data array with all information - * @returns true/false - * - * @deprecated this method is deprecated - * Do not call it anymore - * It'll remain in our public API for compatibility reasons - * - */ - public static function register( $data ) { - return true; // don't do anything - } + /** + * @brief Makes owncloud aware of this app + * @brief This call is deprecated and not necessary to use. + * @param $data array with all information + * @returns true/false + * + * @deprecated this method is deprecated + * Do not call it anymore + * It'll remain in our public API for compatibility reasons + * + */ + public static function register( $data ) { + return true; // don't do anything + } - /** - * @brief adds an entry to the navigation - * @param $data array containing the data - * @returns true/false - * - * This function adds a new entry to the navigation visible to users. $data - * is an associative array. - * The following keys are required: - * - id: unique id for this entry ('addressbook_index') - * - href: link to the page - * - name: Human readable name ('Addressbook') - * - * The following keys are optional: - * - icon: path to the icon of the app - * - order: integer, that influences the position of your application in - * the navigation. Lower values come first. - */ - public static function addNavigationEntry( $data ) { - return \OC_App::addNavigationEntry( $data ); - } + /** + * @brief adds an entry to the navigation + * @param $data array containing the data + * @returns true/false + * + * This function adds a new entry to the navigation visible to users. $data + * is an associative array. + * The following keys are required: + * - id: unique id for this entry ('addressbook_index') + * - href: link to the page + * - name: Human readable name ('Addressbook') + * + * The following keys are optional: + * - icon: path to the icon of the app + * - order: integer, that influences the position of your application in + * the navigation. Lower values come first. + */ + public static function addNavigationEntry( $data ) { + return \OC_App::addNavigationEntry( $data ); + } + /** + * @brief marks a navigation entry as active + * @param $id id of the entry + * @returns true/false + * + * This function sets a navigation entry as active and removes the 'active' + * property from all other entries. The templates can use this for + * highlighting the current position of the user. + */ + public static function setActiveNavigationEntry( $id ) { + return \OC_App::setActiveNavigationEntry( $id ); + } - /** - * @brief marks a navigation entry as active - * @param $id id of the entry - * @returns true/false - * - * This function sets a navigation entry as active and removes the 'active' - * property from all other entries. The templates can use this for - * highlighting the current position of the user. - */ - public static function setActiveNavigationEntry( $id ) { - return \OC_App::setActiveNavigationEntry( $id ); - } + /** + * @brief Register a Configuration Screen that should appear in the personal settings section. + * @param $app string appid + * @param $page string page to be included + */ + public static function registerPersonal( $app, $page ) { + return \OC_App::registerPersonal( $app, $page ); + } + /** + * @brief Register a Configuration Screen that should appear in the Admin section. + * @param $app string appid + * @param $page string page to be included + */ + public static function registerAdmin( $app, $page ) { + return \OC_App::registerAdmin( $app, $page ); + } - /** - * @brief Register a Configuration Screen that should appear in the personal settings section. - * @param $app string appid - * @param $page string page to be included - */ - public static function registerPersonal( $app, $page ) { - return \OC_App::registerPersonal( $app, $page ); - } - - - /** - * @brief Register a Configuration Screen that should appear in the Admin section. - * @param $app string appid - * @param $page string page to be included - */ - public static function registerAdmin( $app, $page ) { - return \OC_App::registerAdmin( $app, $page ); - } - - - /** - * @brief Read app metadata from the info.xml file - * @param string $app id of the app or the path of the info.xml file - * @param boolean path (optional) - * @returns array - */ - public static function getAppInfo( $app, $path=false ) { - return \OC_App::getAppInfo( $app, $path); - } - - - - /** - * @brief checks whether or not an app is enabled - * @param $app app - * @returns true/false - * - * This function checks whether or not an app is enabled. - */ - public static function isEnabled( $app ) { - return \OC_App::isEnabled( $app ); - } - - - /** - * @brief Check if the app is enabled, redirects to home if not - * @param $app app - * @returns true/false - */ - public static function checkAppEnabled( $app ) { - return \OC_Util::checkAppEnabled( $app ); - } - - - /** - * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml - * @param $app app - * @returns true/false - */ - public static function getAppVersion( $app ) { - return \OC_App::getAppVersion( $app ); - } + /** + * @brief Read app metadata from the info.xml file + * @param string $app id of the app or the path of the info.xml file + * @param boolean path (optional) + * @returns array + */ + public static function getAppInfo( $app, $path=false ) { + return \OC_App::getAppInfo( $app, $path); + } + /** + * @brief checks whether or not an app is enabled + * @param $app app + * @returns true/false + * + * This function checks whether or not an app is enabled. + */ + public static function isEnabled( $app ) { + return \OC_App::isEnabled( $app ); + } + /** + * @brief Check if the app is enabled, redirects to home if not + * @param $app app + * @returns true/false + */ + public static function checkAppEnabled( $app ) { + return \OC_Util::checkAppEnabled( $app ); + } + /** + * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml + * @param $app app + * @returns true/false + */ + public static function getAppVersion( $app ) { + return \OC_App::getAppVersion( $app ); + } } From eca24f74f74ad3a76c7900d8267d01f616696a5b Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sat, 8 Sep 2012 15:54:30 +0200 Subject: [PATCH 006/205] style fixes for public app api --- lib/public/app.php | 194 ++++++++++++++++++++++----------------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/lib/public/app.php b/lib/public/app.php index acb401a1d3..809a656f17 100644 --- a/lib/public/app.php +++ b/lib/public/app.php @@ -34,109 +34,109 @@ namespace OCP; * This class provides functions to manage apps in ownCloud */ class App { - /** - * @brief Makes owncloud aware of this app - * @brief This call is deprecated and not necessary to use. - * @param $data array with all information - * @returns true/false - * - * @deprecated this method is deprecated - * Do not call it anymore - * It'll remain in our public API for compatibility reasons - * - */ - public static function register( $data ) { - return true; // don't do anything - } + /** + * @brief Makes owncloud aware of this app + * @brief This call is deprecated and not necessary to use. + * @param $data array with all information + * @returns true/false + * + * @deprecated this method is deprecated + * Do not call it anymore + * It'll remain in our public API for compatibility reasons + * + */ + public static function register( $data ) { + return true; // don't do anything + } - /** - * @brief adds an entry to the navigation - * @param $data array containing the data - * @returns true/false - * - * This function adds a new entry to the navigation visible to users. $data - * is an associative array. - * The following keys are required: - * - id: unique id for this entry ('addressbook_index') - * - href: link to the page - * - name: Human readable name ('Addressbook') - * - * The following keys are optional: - * - icon: path to the icon of the app - * - order: integer, that influences the position of your application in - * the navigation. Lower values come first. - */ - public static function addNavigationEntry( $data ) { - return \OC_App::addNavigationEntry( $data ); - } + /** + * @brief adds an entry to the navigation + * @param $data array containing the data + * @returns true/false + * + * This function adds a new entry to the navigation visible to users. $data + * is an associative array. + * The following keys are required: + * - id: unique id for this entry ('addressbook_index') + * - href: link to the page + * - name: Human readable name ('Addressbook') + * + * The following keys are optional: + * - icon: path to the icon of the app + * - order: integer, that influences the position of your application in + * the navigation. Lower values come first. + */ + public static function addNavigationEntry( $data ) { + return \OC_App::addNavigationEntry( $data ); + } - /** - * @brief marks a navigation entry as active - * @param $id id of the entry - * @returns true/false - * - * This function sets a navigation entry as active and removes the 'active' - * property from all other entries. The templates can use this for - * highlighting the current position of the user. - */ - public static function setActiveNavigationEntry( $id ) { - return \OC_App::setActiveNavigationEntry( $id ); - } + /** + * @brief marks a navigation entry as active + * @param $id id of the entry + * @returns true/false + * + * This function sets a navigation entry as active and removes the 'active' + * property from all other entries. The templates can use this for + * highlighting the current position of the user. + */ + public static function setActiveNavigationEntry( $id ) { + return \OC_App::setActiveNavigationEntry( $id ); + } - /** - * @brief Register a Configuration Screen that should appear in the personal settings section. - * @param $app string appid - * @param $page string page to be included - */ - public static function registerPersonal( $app, $page ) { - return \OC_App::registerPersonal( $app, $page ); - } + /** + * @brief Register a Configuration Screen that should appear in the personal settings section. + * @param $app string appid + * @param $page string page to be included + */ + public static function registerPersonal( $app, $page ) { + return \OC_App::registerPersonal( $app, $page ); + } - /** - * @brief Register a Configuration Screen that should appear in the Admin section. - * @param $app string appid - * @param $page string page to be included - */ - public static function registerAdmin( $app, $page ) { - return \OC_App::registerAdmin( $app, $page ); - } + /** + * @brief Register a Configuration Screen that should appear in the Admin section. + * @param $app string appid + * @param $page string page to be included + */ + public static function registerAdmin( $app, $page ) { + return \OC_App::registerAdmin( $app, $page ); + } - /** - * @brief Read app metadata from the info.xml file - * @param string $app id of the app or the path of the info.xml file - * @param boolean path (optional) - * @returns array - */ - public static function getAppInfo( $app, $path=false ) { - return \OC_App::getAppInfo( $app, $path); - } + /** + * @brief Read app metadata from the info.xml file + * @param string $app id of the app or the path of the info.xml file + * @param boolean path (optional) + * @returns array + */ + public static function getAppInfo( $app, $path=false ) { + return \OC_App::getAppInfo( $app, $path); + } - /** - * @brief checks whether or not an app is enabled - * @param $app app - * @returns true/false - * - * This function checks whether or not an app is enabled. - */ - public static function isEnabled( $app ) { - return \OC_App::isEnabled( $app ); - } + /** + * @brief checks whether or not an app is enabled + * @param $app app + * @returns true/false + * + * This function checks whether or not an app is enabled. + */ + public static function isEnabled( $app ) { + return \OC_App::isEnabled( $app ); + } - /** - * @brief Check if the app is enabled, redirects to home if not - * @param $app app - * @returns true/false - */ - public static function checkAppEnabled( $app ) { - return \OC_Util::checkAppEnabled( $app ); - } + /** + * @brief Check if the app is enabled, redirects to home if not + * @param $app app + * @returns true/false + */ + public static function checkAppEnabled( $app ) { + return \OC_Util::checkAppEnabled( $app ); + } - /** - * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml - * @param $app app - * @returns true/false - */ - public static function getAppVersion( $app ) { - return \OC_App::getAppVersion( $app ); - } + /** + * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml + * @param $app app + * @returns true/false + */ + public static function getAppVersion( $app ) { + return \OC_App::getAppVersion( $app ); + } } From 221257d2fbe5b0f6f440ef5ba38a7562e37eaf1a Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sat, 8 Sep 2012 15:58:28 +0200 Subject: [PATCH 007/205] style fixes for public config api --- lib/public/config.php | 103 ++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 58 deletions(-) diff --git a/lib/public/config.php b/lib/public/config.php index fa9658e728..377150115f 100644 --- a/lib/public/config.php +++ b/lib/public/config.php @@ -38,8 +38,6 @@ namespace OCP; * This class provides functions to read and write configuration data. configuration can be on a system, application or user level */ class Config { - - /** * @brief Gets a value from config.php * @param $key key @@ -53,7 +51,6 @@ class Config { return(\OC_Config::getValue( $key, $default )); } - /** * @brief Sets a value * @param $key key @@ -67,70 +64,60 @@ class Config { return(\OC_Config::setValue( $key, $value )); } - - /** - * @brief Gets the config value - * @param $app app - * @param $key key - * @param $default = null, default value if the key does not exist - * @returns the value or $default - * - * This function gets a value from the appconfig table. If the key does - * not exist the default value will be returnes - */ - public static function getAppValue( $app, $key, $default = null ) { + /** + * @brief Gets the config value + * @param $app app + * @param $key key + * @param $default = null, default value if the key does not exist + * @returns the value or $default + * + * This function gets a value from the appconfig table. If the key does + * not exist the default value will be returnes + */ + public static function getAppValue( $app, $key, $default = null ) { return(\OC_Appconfig::getValue( $app, $key, $default )); } - - /** - * @brief sets a value in the appconfig - * @param $app app - * @param $key key - * @param $value value - * @returns true/false - * - * Sets a value. If the key did not exist before it will be created. - */ - public static function setAppValue( $app, $key, $value ) { + /** + * @brief sets a value in the appconfig + * @param $app app + * @param $key key + * @param $value value + * @returns true/false + * + * Sets a value. If the key did not exist before it will be created. + */ + public static function setAppValue( $app, $key, $value ) { return(\OC_Appconfig::setValue( $app, $key, $value )); } - - /** - * @brief Gets the preference - * @param $user user - * @param $app app - * @param $key key - * @param $default = null, default value if the key does not exist - * @returns the value or $default - * - * This function gets a value from the prefernces table. If the key does - * not exist the default value will be returnes - */ - public static function getUserValue( $user, $app, $key, $default = null ) { + /** + * @brief Gets the preference + * @param $user user + * @param $app app + * @param $key key + * @param $default = null, default value if the key does not exist + * @returns the value or $default + * + * This function gets a value from the prefernces table. If the key does + * not exist the default value will be returnes + */ + public static function getUserValue( $user, $app, $key, $default = null ) { return(\OC_Preferences::getValue( $user, $app, $key, $default )); } - - /** - * @brief sets a value in the preferences - * @param $user user - * @param $app app - * @param $key key - * @param $value value - * @returns true/false - * - * Adds a value to the preferences. If the key did not exist before, it - * will be added automagically. - */ - public static function setUserValue( $user, $app, $key, $value ) { + /** + * @brief sets a value in the preferences + * @param $user user + * @param $app app + * @param $key key + * @param $value value + * @returns true/false + * + * Adds a value to the preferences. If the key did not exist before, it + * will be added automagically. + */ + public static function setUserValue( $user, $app, $key, $value ) { return(\OC_Preferences::setValue( $user, $app, $key, $value )); } - - - - - - } From 6b2b8b10ee771776023e64a62f59c1bd620605fb Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sat, 8 Sep 2012 16:00:32 +0200 Subject: [PATCH 008/205] style fixes for public db api --- lib/public/db.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/lib/public/db.php b/lib/public/db.php index 5ac356bb47..6ce62b27ca 100644 --- a/lib/public/db.php +++ b/lib/public/db.php @@ -34,8 +34,6 @@ namespace OCP; * This class provides access to the internal database system. Use this class exlusively if you want to access databases */ class DB { - - /** * @brief Prepare a SQL query * @param $query Query string @@ -47,7 +45,6 @@ class DB { return(\OC_DB::prepare($query,$limit,$offset)); } - /** * @brief gets last value of autoincrement * @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix @@ -62,7 +59,6 @@ class DB { return(\OC_DB::insertid($table)); } - /** * @brief Start a transaction */ @@ -70,7 +66,6 @@ class DB { return(\OC_DB::beginTransaction()); } - /** * @brief Commit the database changes done during a transaction that is in progress */ @@ -78,7 +73,6 @@ class DB { return(\OC_DB::commit()); } - /** * @brief check if a result is an error, works with MDB2 and PDOException * @param mixed $result @@ -87,7 +81,4 @@ class DB { public static function isError($result) { return(\OC_DB::isError($result)); } - - - } From 89e5b85fa7c64c5989224dd41142cb9a6d3c816e Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sat, 8 Sep 2012 16:02:11 +0200 Subject: [PATCH 009/205] style fixes for public files api --- lib/public/files.php | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/lib/public/files.php b/lib/public/files.php index 2f4f459bd9..90889c59ad 100644 --- a/lib/public/files.php +++ b/lib/public/files.php @@ -34,8 +34,6 @@ namespace OCP; * This class provides access to the internal filesystem abstraction layer. Use this class exlusively if you want to access files */ class Files { - - /** * @brief Recusive deletion of folders * @param string $dir path to the folder @@ -45,7 +43,6 @@ class Files { \OC_Helper::rmdirr( $dir ); } - /** * get the mimetype form a local file * @param string path @@ -56,7 +53,6 @@ class Files { return(\OC_Helper::getMimeType( $path )); } - /** * copy the contents of one stream to another * @param resource source @@ -67,7 +63,6 @@ class Files { return(\OC_Helper::streamCopy( $source, $target )); } - /** * create a temporary file with an unique filename * @param string postfix @@ -79,7 +74,6 @@ class Files { return(\OC_Helper::tmpFile( $postfix )); } - /** * create a temporary folder with an unique filename * @return string @@ -90,7 +84,6 @@ class Files { return(\OC_Helper::tmpFolder()); } - /** * Adds a suffix to the name in case the file exists * @@ -102,16 +95,12 @@ class Files { return(\OC_Helper::buildNotExistingFileName( $path, $filename )); } - /** - * @param string appid - * @param $app app - * @return OC_FilesystemView - */ - public static function getStorage( $app ) { + /** + * @param string appid + * @param $app app + * @return OC_FilesystemView + */ + public static function getStorage( $app ) { return \OC_App::getStorage( $app ); } - - - - } From a16565a7faff363bbb093e3cbeda6e843251cdeb Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sat, 8 Sep 2012 16:14:06 +0200 Subject: [PATCH 010/205] style fixes for public json api --- lib/public/json.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/public/json.php b/lib/public/json.php index 93be920c6d..2186dd8ee4 100644 --- a/lib/public/json.php +++ b/lib/public/json.php @@ -34,7 +34,6 @@ namespace OCP; * This class provides convinient functions to generate and send JSON data. Usefull for Ajax calls */ class JSON { - /** * @brief Encode and print $data in JSON format * @param array $data The data to use @@ -170,5 +169,4 @@ class JSON { public static function checkAdminUser() { return(\OC_JSON::checkAdminUser()); } - } From 439ede2a1d06b707ebce8195a551224dc5e3dbfd Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sat, 8 Sep 2012 16:15:42 +0200 Subject: [PATCH 011/205] style fixes for public response api --- lib/public/response.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/public/response.php b/lib/public/response.php index febb3f1436..95e67a8572 100644 --- a/lib/public/response.php +++ b/lib/public/response.php @@ -34,8 +34,6 @@ namespace OCP; * This class provides convinient functions to send the correct http response headers */ class Response { - - /** * @brief Enable response caching by sending correct HTTP headers * @param $cache_time time to cache the response @@ -47,7 +45,6 @@ class Response { return(\OC_Response::enableCaching( $cache_time )); } - /** * Checks and set Last-Modified header, when the request matches sends a * 'not modified' response @@ -57,7 +54,6 @@ class Response { return(\OC_Response::setLastModifiedHeader( $lastModified )); } - /** * @brief disable browser caching * @see enableCaching with cache_time = 0 @@ -66,7 +62,6 @@ class Response { return(\OC_Response::disableCaching()); } - /** * Checks and set ETag header, when the request matches sends a * 'not modified' response @@ -76,7 +71,6 @@ class Response { return(\OC_Response::setETagHeader( $etag )); } - /** * @brief Send file as response, checking and setting caching headers * @param $filepath of file to send @@ -102,6 +96,4 @@ class Response { static public function redirect( $location ) { return(\OC_Response::redirect( $location )); } - - -} +} \ No newline at end of file From 89f3afe2fead6f40eaeaa23db88ee70edb9cd61a Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sat, 8 Sep 2012 16:17:01 +0200 Subject: [PATCH 012/205] style fixes for public user api --- lib/public/user.php | 38 +++++++++++++------------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/lib/public/user.php b/lib/public/user.php index b530321f21..b320ce8ea0 100644 --- a/lib/public/user.php +++ b/lib/public/user.php @@ -34,8 +34,6 @@ namespace OCP; * This class provides access to the user management. You can get information about the currently logged in user and the permissions for example */ class User { - - /** * @brief get the user id of the user currently logged in. * @return string uid or false @@ -44,7 +42,6 @@ class User { return \OC_USER::getUser(); } - /** * @brief Get a list of all users * @returns array with all uids @@ -55,7 +52,6 @@ class User { return \OC_USER::getUsers(); } - /** * @brief Check if the user is logged in * @returns true/false @@ -66,7 +62,6 @@ class User { return \OC_USER::isLoggedIn(); } - /** * @brief check if a user exists * @param string $uid the username @@ -76,7 +71,6 @@ class User { return \OC_USER::userExists( $uid ); } - /** * @brief Loggs the user out including all the session data * @returns true @@ -87,7 +81,6 @@ class User { return \OC_USER::logout(); } - /** * @brief Check if the password is correct * @param $uid The username @@ -100,23 +93,18 @@ class User { return \OC_USER::checkPassword( $uid, $password ); } + /** + * Check if the user is a admin, redirects to home if not + */ + public static function checkAdminUser() { + \OC_Util::checkAdminUser(); + } - /** - * Check if the user is a admin, redirects to home if not - */ - public static function checkAdminUser() { - \OC_Util::checkAdminUser(); - } - - - /** - * Check if the user is logged in, redirects to home if not. With - * redirect URL parameter to the request URI. - */ - public static function checkLoggedIn() { - \OC_Util::checkLoggedIn(); - } - - - + /** + * Check if the user is logged in, redirects to home if not. With + * redirect URL parameter to the request URI. + */ + public static function checkLoggedIn() { + \OC_Util::checkLoggedIn(); + } } From 2b42893fa9e8d564abf47d495558295d2979c0de Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Sat, 8 Sep 2012 16:18:47 +0200 Subject: [PATCH 013/205] style fixes for public util api --- lib/public/util.php | 33 +++++++++------------------------ 1 file changed, 9 insertions(+), 24 deletions(-) diff --git a/lib/public/util.php b/lib/public/util.php index ed23521b04..747448e62e 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -34,8 +34,6 @@ namespace OCP; * This class provides different helper functions to make the life of a developer easier */ class Util { - - // consts for Logging const DEBUG=0; const INFO=1; @@ -43,7 +41,6 @@ class Util { const ERROR=3; const FATAL=4; - /** * @brief get the current installed version of ownCloud * @return array @@ -52,7 +49,6 @@ class Util { return(\OC_Util::getVersion()); } - /** * @brief send an email * @param string $toaddress @@ -68,18 +64,16 @@ class Util { \OC_MAIL::send( $toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname, $html=0, $altbody='', $ccaddress='', $ccname='', $bcc=''); } - - /** + /** * @brief write a message in the log * @param string $app * @param string $message * @param int level - */ - public static function writeLog( $app, $message, $level ) { - // call the internal log class - \OC_LOG::write( $app, $message, $level ); - } - + */ + public static function writeLog( $app, $message, $level ) { + // call the internal log class + \OC_LOG::write( $app, $message, $level ); + } /** * @brief add a css file @@ -87,8 +81,7 @@ class Util { */ public static function addStyle( $application, $file = null ) { \OC_Util::addStyle( $application, $file ); - } - + } /** * @brief add a javascript file @@ -97,7 +90,7 @@ class Util { */ public static function addScript( $application, $file = null ) { \OC_Util::addScript( $application, $file ); - } + } /** * @brief Add a custom element to the header @@ -118,8 +111,6 @@ class Util { return(\OC_Util::formatDate( $timestamp,$dateOnly )); } - - /** * @brief Creates an absolute url * @param $app app @@ -133,7 +124,6 @@ class Util { return(\OC_Helper::linkToAbsolute( $app, $file, $args )); } - /** * @brief Creates an absolute url for remote use * @param $service id @@ -156,7 +146,6 @@ class Util { return \OC_Helper::linkToPublic($service); } - /** * @brief Creates an url * @param $app app @@ -199,11 +188,10 @@ class Util { * * Returns the path to the image. */ - public static function imagePath( $app, $image ) { + public static function imagePath( $app, $image ) { return(\OC_Helper::imagePath( $app, $image )); } - /** * @brief Make a human file size * @param $bytes file size in bytes @@ -244,7 +232,6 @@ class Util { return(\OC_Hook::connect( $signalclass, $signalname, $slotclass, $slotname )); } - /** * @brief emitts a signal * @param $signalclass class name of emitter @@ -260,7 +247,6 @@ class Util { return(\OC_Hook::emit( $signalclass, $signalname, $params )); } - /** * Register an get/post call. This is important to prevent CSRF attacks * TODO: write example @@ -269,7 +255,6 @@ class Util { return(\OC_Util::callRegister()); } - /** * Check an ajax get/post call if the request token is valid. exit if not. * Todo: Write howto From abc930c57c02f605229d6caa8f5aedef39d7ee76 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Sat, 8 Sep 2012 17:58:59 +0200 Subject: [PATCH 014/205] Suppress error message which would send headers for hosted sited where disk_free_space() has been disabled for security. --- lib/filestorage/local.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php index e26d3d3ef9..80aa548047 100644 --- a/lib/filestorage/local.php +++ b/lib/filestorage/local.php @@ -161,7 +161,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{ } public function free_space($path) { - return disk_free_space($this->datadir.$path); + return @disk_free_space($this->datadir.$path); } public function search($query) { From 697061fa9f6279b8d8f24d984543aeccb6214ba2 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 8 Sep 2012 23:26:19 +0200 Subject: [PATCH 015/205] add OC_Image::fitIn --- lib/image.php | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/lib/image.php b/lib/image.php index f4b3c2cc07..861353e039 100644 --- a/lib/image.php +++ b/lib/image.php @@ -543,21 +543,7 @@ class OC_Image { $new_height = $maxsize; } - $process = imagecreatetruecolor(round($new_width), round($new_height)); - if ($process == false) { - OC_Log::write('core',__METHOD__.'(): Error creating true color image',OC_Log::ERROR); - imagedestroy($process); - return false; - } - - imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig); - if ($process == false) { - OC_Log::write('core',__METHOD__.'(): Error resampling process image '.$new_width.'x'.$new_height,OC_Log::ERROR); - imagedestroy($process); - return false; - } - imagedestroy($this->resource); - $this->resource = $process; + $this->preciseResize(round($new_width), round($new_height)); return true; } @@ -666,6 +652,28 @@ class OC_Image { return true; } + /** + * @brief Resizes the image to fit within a boundry while preserving ratio. + * @param $maxWidth + * @param $maxHeight + * @returns bool + */ + public function fitIn($maxWidth, $maxHeight) { + if(!$this->valid()) { + OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR); + return false; + } + $width_orig=imageSX($this->resource); + $height_orig=imageSY($this->resource); + $ratio = $width_orig/$height_orig; + + $newWidth = min($maxWidth, $ratio*$maxHeight); + $newHeight = min($maxHeight, $maxWidth/$ratio); + + $this->preciseResize(round($newWidth), round($newHeight)); + return true; + } + public function destroy() { if($this->valid()) { imagedestroy($this->resource); From 46422e6dbeac4993a4750f1dfec16f8e22a1d876 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 8 Sep 2012 23:40:23 +0200 Subject: [PATCH 016/205] don't use regular expresions for a simple string replace --- lib/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index 1c6cc70b0e..679acdb6e5 100644 --- a/lib/base.php +++ b/lib/base.php @@ -75,7 +75,7 @@ class OC{ /** @TODO: Remove this when necessary Remove "apps/" from inclusion path for smooth migration to mutli app dir */ - $path = preg_replace('/apps\//', '', OC::$CLASSPATH[$className]); + $path = str_replace('apps/', '', OC::$CLASSPATH[$className]); require_once $path; } elseif(strpos($className, 'OC_')===0) { From b14265b5c3671c260c75b1fa7b39504ea2e058e3 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sat, 8 Sep 2012 23:56:37 +0200 Subject: [PATCH 017/205] add js versions of basename and dirname --- core/js/js.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/js/js.js b/core/js/js.js index 1bd650bb6b..21466a809b 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -154,6 +154,12 @@ OC={ $('head').append(style); } }, + basename: function(path) { + return path.replace(/\\/g,'/').replace( /.*\//, '' ); + }, + dirname: function(path) { + return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');; + } /** * do a search query and display the results * @param query the search query From 9beb95884599640d94f0e8de2d03963b5109a22f Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 9 Sep 2012 00:35:02 +0200 Subject: [PATCH 018/205] forgot a , --- core/js/js.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/js.js b/core/js/js.js index 21466a809b..afc0732d66 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -159,7 +159,7 @@ OC={ }, dirname: function(path) { return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');; - } + }, /** * do a search query and display the results * @param query the search query From 5e790368bc72167eb3c390cc43d00956714d7fff Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 9 Sep 2012 02:03:35 +0200 Subject: [PATCH 019/205] [tx-robot] updated from transifex --- apps/files/l10n/cs_CZ.php | 2 ++ apps/files/l10n/eo.php | 5 ++++ apps/files/l10n/eu.php | 5 ++++ apps/files/l10n/it.php | 2 ++ apps/files/l10n/ru.php | 2 ++ apps/files/l10n/sl.php | 2 ++ apps/files/l10n/sv.php | 2 ++ apps/files/l10n/th_TH.php | 2 ++ apps/files_external/l10n/eu.php | 1 + apps/files_sharing/l10n/eo.php | 5 +++- apps/files_sharing/l10n/et_EE.php | 6 +++- apps/files_sharing/l10n/ru.php | 1 + apps/files_versions/l10n/eo.php | 2 ++ core/l10n/eo.php | 1 + core/l10n/eu.php | 1 + l10n/cs_CZ/files.po | 10 +++---- l10n/eo/core.po | 38 ++++++++++++------------ l10n/eo/files.po | 16 +++++----- l10n/eo/files_sharing.po | 16 +++++----- l10n/eo/files_versions.po | 12 ++++---- l10n/eo/lib.po | 46 ++++++++++++++--------------- l10n/et_EE/files_sharing.po | 20 ++++++------- l10n/eu/core.po | 38 ++++++++++++------------ l10n/eu/files.po | 16 +++++----- l10n/eu/files_external.po | 8 ++--- l10n/it/files.po | 10 +++---- l10n/ru/files.po | 10 +++---- l10n/ru/files_sharing.po | 13 ++++---- l10n/ru/settings.po | 43 ++++++++++++++------------- l10n/sl/files.po | 10 +++---- l10n/sv/files.po | 10 +++---- l10n/templates/core.pot | 28 +++++++++--------- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/th_TH/files.po | 10 +++---- lib/l10n/eo.php | 5 +++- settings/l10n/ru.php | 18 +++++++++++ 43 files changed, 245 insertions(+), 187 deletions(-) diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index f29df70ee6..3269420e5a 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Chybí adresář pro dočasné soubory", "Failed to write to disk" => "Zápis na disk selhal", "Files" => "Soubory", +"Unshare" => "Zrušit sdílení", "Delete" => "Smazat", "already exists" => "již existuje", "replace" => "nahradit", @@ -15,6 +16,7 @@ "replaced" => "nahrazeno", "undo" => "zpět", "with" => "s", +"unshared" => "Sdílení zrušeno", "deleted" => "smazáno", "generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.", "Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů", diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php index bf17b97244..95df1363ff 100644 --- a/apps/files/l10n/eo.php +++ b/apps/files/l10n/eo.php @@ -7,19 +7,23 @@ "Missing a temporary folder" => "Mankas tempa dosierujo", "Failed to write to disk" => "Malsukcesis skribo al disko", "Files" => "Dosieroj", +"Unshare" => "Malkunhavigi", "Delete" => "Forigi", "already exists" => "jam ekzistas", "replace" => "anstataŭigi", +"suggest name" => "sugesti nomon", "cancel" => "nuligi", "replaced" => "anstataŭigita", "undo" => "malfari", "with" => "kun", +"unshared" => "malkunhavigita", "deleted" => "forigita", "generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo", "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn", "Upload Error" => "Alŝuta eraro", "Pending" => "Traktotaj", "Upload cancelled." => "La alŝuto nuliĝis.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.", "Invalid name, '/' is not allowed." => "Nevalida nomo, “/” ne estas permesata.", "Size" => "Grando", "Modified" => "Modifita", @@ -34,6 +38,7 @@ "Enable ZIP-download" => "Kapabligi ZIP-elŝuton", "0 is unlimited" => "0 signifas senlime", "Maximum input size for ZIP files" => "Maksimuma enirgrando por ZIP-dosieroj", +"Save" => "Konservi", "New" => "Nova", "Text file" => "Tekstodosiero", "Folder" => "Dosierujo", diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php index 3897a5580f..d72e73adf0 100644 --- a/apps/files/l10n/eu.php +++ b/apps/files/l10n/eu.php @@ -7,19 +7,23 @@ "Missing a temporary folder" => "Aldi baterako karpeta falta da", "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan", "Files" => "Fitxategiak", +"Unshare" => "Ez partekatu", "Delete" => "Ezabatu", "already exists" => "dagoeneko existitzen da", "replace" => "ordeztu", +"suggest name" => "aholkatu izena", "cancel" => "ezeztatu", "replaced" => "ordeztua", "undo" => "desegin", "with" => "honekin", +"unshared" => "Ez partekatuta", "deleted" => "ezabatuta", "generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake", "Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu", "Upload Error" => "Igotzean errore bat suertatu da", "Pending" => "Zain", "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. ", "Size" => "Tamaina", "Modified" => "Aldatuta", @@ -34,6 +38,7 @@ "Enable ZIP-download" => "Gaitu ZIP-deskarga", "0 is unlimited" => "0 mugarik gabe esan nahi du", "Maximum input size for ZIP files" => "ZIP fitxategien gehienezko tamaina", +"Save" => "Gorde", "New" => "Berria", "Text file" => "Testu fitxategia", "Folder" => "Karpeta", diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php index 0df60832c5..c7046118a3 100644 --- a/apps/files/l10n/it.php +++ b/apps/files/l10n/it.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Cartella temporanea mancante", "Failed to write to disk" => "Scrittura su disco non riuscita", "Files" => "File", +"Unshare" => "Rimuovi condivisione", "Delete" => "Elimina", "already exists" => "esiste già", "replace" => "sostituisci", @@ -15,6 +16,7 @@ "replaced" => "sostituito", "undo" => "annulla", "with" => "con", +"unshared" => "condivisione rimossa", "deleted" => "eliminati", "generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.", "Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte", diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php index b013ae8985..61091790af 100644 --- a/apps/files/l10n/ru.php +++ b/apps/files/l10n/ru.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Невозможно найти временную папку", "Failed to write to disk" => "Ошибка записи на диск", "Files" => "Файлы", +"Unshare" => "Отменить публикацию", "Delete" => "Удалить", "already exists" => "уже существует", "replace" => "заменить", @@ -15,6 +16,7 @@ "replaced" => "заменён", "undo" => "отмена", "with" => "с", +"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 байт в каталог", diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php index 0d56a0c647..1a7ae8c0b1 100644 --- a/apps/files/l10n/sl.php +++ b/apps/files/l10n/sl.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Manjka začasna mapa", "Failed to write to disk" => "Pisanje na disk je spodletelo", "Files" => "Datoteke", +"Unshare" => "Odstrani iz souporabe", "Delete" => "Izbriši", "already exists" => "že obstaja", "replace" => "nadomesti", @@ -15,6 +16,7 @@ "replaced" => "nadomeščen", "undo" => "razveljavi", "with" => "z", +"unshared" => "odstranjeno iz souporabe", "deleted" => "izbrisano", "generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.", "Unable to upload your file as it is a directory or has 0 bytes" => "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov.", diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php index 137222b417..06d988d451 100644 --- a/apps/files/l10n/sv.php +++ b/apps/files/l10n/sv.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Saknar en tillfällig mapp", "Failed to write to disk" => "Misslyckades spara till disk", "Files" => "Filer", +"Unshare" => "Sluta dela", "Delete" => "Radera", "already exists" => "finns redan", "replace" => "ersätt", @@ -15,6 +16,7 @@ "replaced" => "ersatt", "undo" => "ångra", "with" => "med", +"unshared" => "Ej delad", "deleted" => "raderad", "generating ZIP-file, it may take some time." => "genererar ZIP-fil, det kan ta lite tid.", "Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.", diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php index 5809ac1f09..2208051236 100644 --- a/apps/files/l10n/th_TH.php +++ b/apps/files/l10n/th_TH.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย", "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว", "Files" => "ไฟล์", +"Unshare" => "ยกเลิกการแชร์ข้อมูล", "Delete" => "ลบ", "already exists" => "มีอยู่แล้ว", "replace" => "แทนที่", @@ -15,6 +16,7 @@ "replaced" => "แทนที่แล้ว", "undo" => "เลิกทำ", "with" => "กับ", +"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 ไบต์", diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php index d1028d2b9b..6299390c26 100644 --- a/apps/files_external/l10n/eu.php +++ b/apps/files_external/l10n/eu.php @@ -4,6 +4,7 @@ "Backend" => "Motorra", "Configuration" => "Konfigurazioa", "Options" => "Aukerak", +"Applicable" => "Aplikagarria", "Add mount point" => "Gehitu muntatze puntua", "None set" => "Ezarri gabe", "All Users" => "Erabiltzaile guztiak", diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php index 5ef330a53e..e71715f0f1 100644 --- a/apps/files_sharing/l10n/eo.php +++ b/apps/files_sharing/l10n/eo.php @@ -1,4 +1,7 @@ "Pasvorto", -"Submit" => "Sendi" +"Submit" => "Sendi", +"Download" => "Elŝuti", +"No preview available for" => "Ne haveblas antaŭvido por", +"web services under your control" => "TTT-servoj regataj de vi" ); diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php index da299f4ff7..94b9b1d7ae 100644 --- a/apps/files_sharing/l10n/et_EE.php +++ b/apps/files_sharing/l10n/et_EE.php @@ -1,3 +1,7 @@ "Kustutamine" +"Password" => "Parool", +"Submit" => "Saada", +"Download" => "Lae alla", +"No preview available for" => "Eelvaadet pole saadaval", +"web services under your control" => "veebitenused sinu kontrolli all" ); diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php index 958ac1030d..398d9a8bbc 100644 --- a/apps/files_sharing/l10n/ru.php +++ b/apps/files_sharing/l10n/ru.php @@ -2,5 +2,6 @@ "Password" => "Пароль", "Submit" => "Отправить", "Download" => "Скачать", +"No preview available for" => "Предпросмотр недоступен для", "web services under your control" => "веб-сервисы под вашим управлением" ); diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php index 8ec0895638..2f22b5ac0a 100644 --- a/apps/files_versions/l10n/eo.php +++ b/apps/files_versions/l10n/eo.php @@ -1,4 +1,6 @@ "Eksvalidigi ĉiujn eldonojn", +"Versions" => "Eldonoj", +"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj", "Enable Files Versioning" => "Kapabligi dosiereldonkontrolon" ); diff --git a/core/l10n/eo.php b/core/l10n/eo.php index 930b20a30a..f1deaf3c9d 100644 --- a/core/l10n/eo.php +++ b/core/l10n/eo.php @@ -50,6 +50,7 @@ "Database user" => "Datumbaza uzanto", "Database password" => "Datumbaza pasvorto", "Database name" => "Datumbaza nomo", +"Database tablespace" => "Datumbaza tabelospaco", "Database host" => "Datumbaza gastigo", "Finish setup" => "Fini la instalon", "web services under your control" => "TTT-servoj sub via kontrolo", diff --git a/core/l10n/eu.php b/core/l10n/eu.php index 9e9717dd8d..58a63b6e68 100644 --- a/core/l10n/eu.php +++ b/core/l10n/eu.php @@ -50,6 +50,7 @@ "Database user" => "Datubasearen erabiltzailea", "Database password" => "Datubasearen pasahitza", "Database name" => "Datubasearen izena", +"Database tablespace" => "Datu basearen taula-lekua", "Database host" => "Datubasearen hostalaria", "Finish setup" => "Bukatu konfigurazioa", "web services under your control" => "web zerbitzuak zure kontrolpean", diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index bbdfc08e88..9a8fb88304 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.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-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 09:02+0000\n" +"Last-Translator: Tomáš Chvátal \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" @@ -56,7 +56,7 @@ msgstr "Soubory" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Zrušit sdílení" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -92,7 +92,7 @@ msgstr "s" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "Sdílení zrušeno" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/eo/core.po b/l10n/eo/core.po index 416d3dd21f..5af54675c7 100644 --- a/l10n/eo/core.po +++ b/l10n/eo/core.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-06 02:02+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 21:41+0000\n" +"Last-Translator: Mariano \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,55 +32,55 @@ msgstr "Ĉu neniu kategorio estas aldonota?" msgid "This category already exists: " msgstr "Ĉi tiu kategorio jam ekzistas: " -#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61 +#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55 msgid "Settings" msgstr "Agordo" -#: js/js.js:593 +#: js/js.js:599 msgid "January" msgstr "Januaro" -#: js/js.js:593 +#: js/js.js:599 msgid "February" msgstr "Februaro" -#: js/js.js:593 +#: js/js.js:599 msgid "March" msgstr "Marto" -#: js/js.js:593 +#: js/js.js:599 msgid "April" msgstr "Aprilo" -#: js/js.js:593 +#: js/js.js:599 msgid "May" msgstr "Majo" -#: js/js.js:593 +#: js/js.js:599 msgid "June" msgstr "Junio" -#: js/js.js:594 +#: js/js.js:600 msgid "July" msgstr "Julio" -#: js/js.js:594 +#: js/js.js:600 msgid "August" msgstr "Aŭgusto" -#: js/js.js:594 +#: js/js.js:600 msgid "September" msgstr "Septembro" -#: js/js.js:594 +#: js/js.js:600 msgid "October" msgstr "Oktobro" -#: js/js.js:594 +#: js/js.js:600 msgid "November" msgstr "Novembro" -#: js/js.js:594 +#: js/js.js:600 msgid "December" msgstr "Decembro" @@ -228,7 +228,7 @@ msgstr "Datumbaza nomo" #: templates/installation.php:109 msgid "Database tablespace" -msgstr "" +msgstr "Datumbaza tabelospaco" #: templates/installation.php:115 msgid "Database host" @@ -238,11 +238,11 @@ msgstr "Datumbaza gastigo" msgid "Finish setup" msgstr "Fini la instalon" -#: templates/layout.guest.php:42 +#: templates/layout.guest.php:36 msgid "web services under your control" msgstr "TTT-servoj sub via kontrolo" -#: templates/layout.user.php:45 +#: templates/layout.user.php:39 msgid "Log out" msgstr "Elsaluti" diff --git a/l10n/eo/files.po b/l10n/eo/files.po index c8529b431a..d62532d142 100644 --- a/l10n/eo/files.po +++ b/l10n/eo/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-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 21:57+0000\n" +"Last-Translator: Mariano \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +55,7 @@ msgstr "Dosieroj" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Malkunhavigi" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -71,7 +71,7 @@ msgstr "anstataŭigi" #: js/filelist.js:186 msgid "suggest name" -msgstr "" +msgstr "sugesti nomon" #: js/filelist.js:186 js/filelist.js:188 msgid "cancel" @@ -91,7 +91,7 @@ msgstr "kun" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "malkunhavigita" #: js/filelist.js:270 msgid "deleted" @@ -120,7 +120,7 @@ msgstr "La alŝuto nuliĝis." #: js/files.js:423 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." -msgstr "" +msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton." #: js/files.js:493 msgid "Invalid name, '/' is not allowed." @@ -180,7 +180,7 @@ msgstr "Maksimuma enirgrando por ZIP-dosieroj" #: templates/admin.php:14 msgid "Save" -msgstr "" +msgstr "Konservi" #: templates/index.php:7 msgid "New" diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po index 8ad6599fb0..633cd4eca8 100644 --- a/l10n/eo/files_sharing.po +++ b/l10n/eo/files_sharing.po @@ -8,15 +8,15 @@ 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:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 21:35+0000\n" +"Last-Translator: Mariano \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eo\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/authenticate.php:4 msgid "Password" @@ -28,12 +28,12 @@ msgstr "Sendi" #: templates/public.php:9 templates/public.php:19 msgid "Download" -msgstr "" +msgstr "Elŝuti" #: templates/public.php:18 msgid "No preview available for" -msgstr "" +msgstr "Ne haveblas antaŭvido por" -#: templates/public.php:23 +#: templates/public.php:25 msgid "web services under your control" -msgstr "" +msgstr "TTT-servoj regataj de vi" diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po index d9e4f78ec1..75c78ded12 100644 --- a/l10n/eo/files_versions.po +++ b/l10n/eo/files_versions.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-01 13:35+0200\n" -"PO-Revision-Date: 2012-09-01 11:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 21:36+0000\n" +"Last-Translator: Mariano \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eo\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: js/settings-personal.js:31 templates/settings-personal.php:10 msgid "Expire all versions" @@ -24,11 +24,11 @@ msgstr "Eksvalidigi ĉiujn eldonojn" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "Eldonoj" #: templates/settings-personal.php:7 msgid "This will delete all existing backup versions of your files" -msgstr "" +msgstr "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj" #: templates/settings.php:3 msgid "Enable Files Versioning" diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po index 6b56eeafde..5e677a6045 100644 --- a/l10n/eo/lib.po +++ b/l10n/eo/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 \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 21:50+0000\n" +"Last-Translator: Mariano \n" "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eo\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 "Helpo" -#: app.php:295 +#: app.php:292 msgid "Personal" msgstr "Persona" -#: app.php:300 +#: app.php:297 msgid "Settings" msgstr "Agordo" -#: app.php:305 +#: app.php:302 msgid "Users" msgstr "Uzantoj" -#: app.php:312 +#: app.php:309 msgid "Apps" msgstr "Aplikaĵoj" -#: app.php:314 +#: app.php:311 msgid "Admin" msgstr "Administranto" @@ -70,57 +70,57 @@ msgstr "Aŭtentiga eraro" msgid "Token expired. Please reload page." msgstr "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon." -#: template.php:86 +#: template.php:87 msgid "seconds ago" msgstr "sekundojn antaŭe" -#: template.php:87 +#: template.php:88 msgid "1 minute ago" msgstr "antaŭ 1 minuto" -#: template.php:88 +#: template.php:89 #, php-format msgid "%d minutes ago" msgstr "antaŭ %d minutoj" -#: template.php:91 +#: template.php:92 msgid "today" msgstr "hodiaŭ" -#: template.php:92 +#: template.php:93 msgid "yesterday" msgstr "hieraŭ" -#: template.php:93 +#: template.php:94 #, php-format msgid "%d days ago" msgstr "antaŭ %d tagoj" -#: template.php:94 +#: template.php:95 msgid "last month" msgstr "lasta monato" -#: template.php:95 +#: template.php:96 msgid "months ago" msgstr "monatojn antaŭe" -#: template.php:96 +#: template.php:97 msgid "last year" msgstr "lasta jaro" -#: template.php:97 +#: template.php:98 msgid "years ago" msgstr "jarojn antaŭe" #: updater.php:66 #, php-format msgid "%s is available. Get more information" -msgstr "" +msgstr "%s haveblas. Ekhavu pli da informo" #: updater.php:68 msgid "up to date" -msgstr "" +msgstr "ĝisdata" #: updater.php:71 msgid "updates check is disabled" -msgstr "" +msgstr "ĝisdateckontrolo estas malkapabligita" diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po index 7942c92767..44a935c9b7 100644 --- a/l10n/et_EE/files_sharing.po +++ b/l10n/et_EE/files_sharing.po @@ -8,32 +8,32 @@ 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:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 13:31+0000\n" +"Last-Translator: Rivo Zängov \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: et_EE\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/authenticate.php:4 msgid "Password" -msgstr "" +msgstr "Parool" #: templates/authenticate.php:6 msgid "Submit" -msgstr "" +msgstr "Saada" #: templates/public.php:9 templates/public.php:19 msgid "Download" -msgstr "" +msgstr "Lae alla" #: templates/public.php:18 msgid "No preview available for" -msgstr "" +msgstr "Eelvaadet pole saadaval" -#: templates/public.php:23 +#: templates/public.php:25 msgid "web services under your control" -msgstr "" +msgstr "veebitenused sinu kontrolli all" diff --git a/l10n/eu/core.po b/l10n/eu/core.po index 476fbcd0a1..610d3d95db 100644 --- a/l10n/eu/core.po +++ b/l10n/eu/core.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-06 02:02+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 19:24+0000\n" +"Last-Translator: asieriko \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" @@ -31,55 +31,55 @@ msgstr "Ez dago gehitzeko kategoriarik?" msgid "This category already exists: " msgstr "Kategoria hau dagoeneko existitzen da:" -#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61 +#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55 msgid "Settings" msgstr "Ezarpenak" -#: js/js.js:593 +#: js/js.js:599 msgid "January" msgstr "Urtarrila" -#: js/js.js:593 +#: js/js.js:599 msgid "February" msgstr "Otsaila" -#: js/js.js:593 +#: js/js.js:599 msgid "March" msgstr "Martxoa" -#: js/js.js:593 +#: js/js.js:599 msgid "April" msgstr "Apirila" -#: js/js.js:593 +#: js/js.js:599 msgid "May" msgstr "Maiatza" -#: js/js.js:593 +#: js/js.js:599 msgid "June" msgstr "Ekaina" -#: js/js.js:594 +#: js/js.js:600 msgid "July" msgstr "Uztaila" -#: js/js.js:594 +#: js/js.js:600 msgid "August" msgstr "Abuztua" -#: js/js.js:594 +#: js/js.js:600 msgid "September" msgstr "Iraila" -#: js/js.js:594 +#: js/js.js:600 msgid "October" msgstr "Urria" -#: js/js.js:594 +#: js/js.js:600 msgid "November" msgstr "Azaroa" -#: js/js.js:594 +#: js/js.js:600 msgid "December" msgstr "Abendua" @@ -227,7 +227,7 @@ msgstr "Datubasearen izena" #: templates/installation.php:109 msgid "Database tablespace" -msgstr "" +msgstr "Datu basearen taula-lekua" #: templates/installation.php:115 msgid "Database host" @@ -237,11 +237,11 @@ msgstr "Datubasearen hostalaria" msgid "Finish setup" msgstr "Bukatu konfigurazioa" -#: templates/layout.guest.php:42 +#: templates/layout.guest.php:36 msgid "web services under your control" msgstr "web zerbitzuak zure kontrolpean" -#: templates/layout.user.php:45 +#: templates/layout.user.php:39 msgid "Log out" msgstr "Saioa bukatu" diff --git a/l10n/eu/files.po b/l10n/eu/files.po index 8f0d7e685d..2cd338beb7 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-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 19:20+0000\n" +"Last-Translator: asieriko \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" @@ -55,7 +55,7 @@ msgstr "Fitxategiak" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Ez partekatu" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -71,7 +71,7 @@ msgstr "ordeztu" #: js/filelist.js:186 msgid "suggest name" -msgstr "" +msgstr "aholkatu izena" #: js/filelist.js:186 js/filelist.js:188 msgid "cancel" @@ -91,7 +91,7 @@ msgstr "honekin" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "Ez partekatuta" #: js/filelist.js:270 msgid "deleted" @@ -120,7 +120,7 @@ msgstr "Igoera ezeztatuta" #: js/files.js:423 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." -msgstr "" +msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du." #: js/files.js:493 msgid "Invalid name, '/' is not allowed." @@ -180,7 +180,7 @@ msgstr "ZIP fitxategien gehienezko tamaina" #: templates/admin.php:14 msgid "Save" -msgstr "" +msgstr "Gorde" #: templates/index.php:7 msgid "New" diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po index f614dd9418..5ba75efacd 100644 --- a/l10n/eu/files_external.po +++ b/l10n/eu/files_external.po @@ -8,15 +8,15 @@ 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-30 20:52+0000\n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 19:25+0000\n" "Last-Translator: asieriko \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" "Content-Transfer-Encoding: 8bit\n" "Language: eu\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:3 msgid "External Storage" @@ -40,7 +40,7 @@ msgstr "Aukerak" #: templates/settings.php:11 msgid "Applicable" -msgstr "" +msgstr "Aplikagarria" #: templates/settings.php:23 msgid "Add mount point" diff --git a/l10n/it/files.po b/l10n/it/files.po index 8d0209eb47..0c00e3d9e9 100644 --- a/l10n/it/files.po +++ b/l10n/it/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 07:13+0000\n" +"Last-Translator: Vincenzo Reale \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" @@ -57,7 +57,7 @@ msgstr "File" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Rimuovi condivisione" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -93,7 +93,7 @@ msgstr "con" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "condivisione rimossa" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/ru/files.po b/l10n/ru/files.po index 6d0f5f2024..234fbe404e 100644 --- a/l10n/ru/files.po +++ b/l10n/ru/files.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-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 14:18+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,7 +60,7 @@ msgstr "Файлы" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Отменить публикацию" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -96,7 +96,7 @@ msgstr "с" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "публикация отменена" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po index 97fc33e4ef..217d6cdf37 100644 --- a/l10n/ru/files_sharing.po +++ b/l10n/ru/files_sharing.po @@ -5,19 +5,20 @@ # Translators: # Denis , 2012. # , 2012. +# , 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:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 12:10+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: 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" @@ -33,8 +34,8 @@ msgstr "Скачать" #: templates/public.php:18 msgid "No preview available for" -msgstr "" +msgstr "Предпросмотр недоступен для" -#: templates/public.php:23 +#: templates/public.php:25 msgid "web services under your control" msgstr "веб-сервисы под вашим управлением" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index e898279374..2b830ce906 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -11,13 +11,14 @@ # , 2012. # , 2011. # Victor Bravo <>, 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-05 02:02+0200\n" -"PO-Revision-Date: 2012-09-05 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 12:08+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,11 +37,11 @@ msgstr "Ошибка авторизации" #: ajax/creategroup.php:19 msgid "Group already exists" -msgstr "" +msgstr "Группа уже существует" #: ajax/creategroup.php:28 msgid "Unable to add group" -msgstr "" +msgstr "Невозможно добавить группу" #: ajax/lostpassword.php:14 msgid "Email saved" @@ -60,11 +61,11 @@ msgstr "Неверный запрос" #: ajax/removegroup.php:16 msgid "Unable to delete group" -msgstr "" +msgstr "Невозможно удалить группу" #: ajax/removeuser.php:22 msgid "Unable to delete user" -msgstr "" +msgstr "Невозможно удалить пользователя" #: ajax/setlanguage.php:18 msgid "Language changed" @@ -73,12 +74,12 @@ msgstr "Язык изменён" #: ajax/togglegroups.php:25 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "Невозможно добавить пользователя в группу %s" #: ajax/togglegroups.php:31 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "Невозможно удалить пользователя из группы %s" #: js/apps.js:18 msgid "Error" @@ -111,7 +112,7 @@ msgid "" "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." -msgstr "" +msgstr "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или перенести каталог data за пределы корневого каталога веб-сервера." #: templates/admin.php:31 msgid "Cron" @@ -131,39 +132,39 @@ msgstr "использовать системные задания" #: templates/admin.php:41 msgid "Share API" -msgstr "" +msgstr "API общего доступа" #: templates/admin.php:46 msgid "Enable Share API" -msgstr "" +msgstr "Включить API общего доступа" #: templates/admin.php:47 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Разрешить приложениям доступ к API общего доступа" #: templates/admin.php:51 msgid "Allow links" -msgstr "" +msgstr "Разрешить ссылки" #: templates/admin.php:52 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Разрешить пользователям предоставлять публичный доступ при помощи ссылок" #: templates/admin.php:56 msgid "Allow resharing" -msgstr "" +msgstr "Включить расширенный общий доступ" #: templates/admin.php:57 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Разрешить пользователям отдавать в общий доступ доступные им элементы других пользователей" #: templates/admin.php:60 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Разрешить предоставлять общий доступ любым пользователям" #: templates/admin.php:62 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Ограничить общий доступ группами пользователя" #: templates/admin.php:69 msgid "Log" @@ -181,7 +182,7 @@ msgid "" "licensed under the AGPL." -msgstr "" +msgstr "Разрабатывается сообществом ownCloud, исходный код доступен под лицензией AGPL." #: templates/apps.php:10 msgid "Add your App" @@ -197,7 +198,7 @@ msgstr "Смотрите дополнения на apps.owncloud.com" #: templates/apps.php:30 msgid "-licensed by " -msgstr "" +msgstr " лицензия. Автор " #: templates/help.php:9 msgid "Documentation" diff --git a/l10n/sl/files.po b/l10n/sl/files.po index 419db6b3fa..4f9fad5d5f 100644 --- a/l10n/sl/files.po +++ b/l10n/sl/files.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-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 07:24+0000\n" +"Last-Translator: Peter Peroša \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +56,7 @@ msgstr "Datoteke" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Odstrani iz souporabe" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -92,7 +92,7 @@ msgstr "z" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "odstranjeno iz souporabe" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/sv/files.po b/l10n/sv/files.po index c9508d5b64..53d2e5a81a 100644 --- a/l10n/sv/files.po +++ b/l10n/sv/files.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-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 12:05+0000\n" +"Last-Translator: Magnus Höglund \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" @@ -59,7 +59,7 @@ msgstr "Filer" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Sluta dela" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -95,7 +95,7 @@ msgstr "med" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "Ej delad" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index c74b265889..c96cb3d21e 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-08 02:02+0200\n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,55 +29,55 @@ msgstr "" msgid "This category already exists: " msgstr "" -#: js/js.js:208 templates/layout.user.php:54 templates/layout.user.php:55 +#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55 msgid "Settings" msgstr "" -#: js/js.js:593 +#: js/js.js:599 msgid "January" msgstr "" -#: js/js.js:593 +#: js/js.js:599 msgid "February" msgstr "" -#: js/js.js:593 +#: js/js.js:599 msgid "March" msgstr "" -#: js/js.js:593 +#: js/js.js:599 msgid "April" msgstr "" -#: js/js.js:593 +#: js/js.js:599 msgid "May" msgstr "" -#: js/js.js:593 +#: js/js.js:599 msgid "June" msgstr "" -#: js/js.js:594 +#: js/js.js:600 msgid "July" msgstr "" -#: js/js.js:594 +#: js/js.js:600 msgid "August" msgstr "" -#: js/js.js:594 +#: js/js.js:600 msgid "September" msgstr "" -#: js/js.js:594 +#: js/js.js:600 msgid "October" msgstr "" -#: js/js.js:594 +#: js/js.js:600 msgid "November" msgstr "" -#: js/js.js:594 +#: js/js.js:600 msgid "December" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index e97ace3f33..58cf33ef54 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-08 02:01+0200\n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 7e2709f019..51d6d1bc51 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-08 02:01+0200\n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 311891242c..8e2151c185 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-08 02:02+0200\n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 9f4a05645a..bdd784daef 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-08 02:02+0200\n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index a8efc666c9..55b9c78549 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-08 02:02+0200\n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 41dc540143..bc10d0b809 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-08 02:02+0200\n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index ce3a92f62a..a0b4c398f7 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-08 02:02+0200\n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 7283addbb6..f4c6b8245c 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-08 02:02+0200\n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po index 021f82d452..1ade0abea9 100644 --- a/l10n/th_TH/files.po +++ b/l10n/th_TH/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-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-09 02:01+0200\n" +"PO-Revision-Date: 2012-09-08 03:31+0000\n" +"Last-Translator: AriesAnywhere Anywhere \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" @@ -55,7 +55,7 @@ msgstr "ไฟล์" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "ยกเลิกการแชร์ข้อมูล" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -91,7 +91,7 @@ msgstr "กับ" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "ยกเลิกการแชร์ข้อมูลแล้ว" #: js/filelist.js:270 msgid "deleted" diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php index 3f89e2eca7..b3c1c52ece 100644 --- a/lib/l10n/eo.php +++ b/lib/l10n/eo.php @@ -21,5 +21,8 @@ "last month" => "lasta monato", "months ago" => "monatojn antaŭe", "last year" => "lasta jaro", -"years ago" => "jarojn antaŭe" +"years ago" => "jarojn antaŭe", +"%s is available. Get more information" => "%s haveblas. Ekhavu pli da informo", +"up to date" => "ĝisdata", +"updates check is disabled" => "ĝisdateckontrolo estas malkapabligita" ); diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index 5cbeb002ec..bab81560be 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -1,26 +1,44 @@ "Загрузка из App Store запрещена", "Authentication error" => "Ошибка авторизации", +"Group already exists" => "Группа уже существует", +"Unable to add group" => "Невозможно добавить группу", "Email saved" => "Email сохранен", "Invalid email" => "Неправильный Email", "OpenID Changed" => "OpenID изменён", "Invalid request" => "Неверный запрос", +"Unable to delete group" => "Невозможно удалить группу", +"Unable to delete user" => "Невозможно удалить пользователя", "Language changed" => "Язык изменён", +"Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s", +"Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s", "Error" => "Ошибка", "Disable" => "Отключить", "Enable" => "Включить", "Saving..." => "Сохранение...", "__language_name__" => "Русский ", "Security Warning" => "Предупреждение безопасности", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или перенести каталог data за пределы корневого каталога веб-сервера.", "Cron" => "Задание", "execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы", "cron.php is registered at a webcron service" => "cron.php зарегистрирован в webcron сервисе", "use systems cron service" => "использовать системные задания", +"Share API" => "API общего доступа", +"Enable Share API" => "Включить API общего доступа", +"Allow apps to use the Share API" => "Разрешить приложениям доступ к API общего доступа", +"Allow links" => "Разрешить ссылки", +"Allow users to share items to the public with links" => "Разрешить пользователям предоставлять публичный доступ при помощи ссылок", +"Allow resharing" => "Включить расширенный общий доступ", +"Allow users to share items shared with them again" => "Разрешить пользователям отдавать в общий доступ доступные им элементы других пользователей", +"Allow users to share with anyone" => "Разрешить предоставлять общий доступ любым пользователям", +"Allow users to only share with users in their groups" => "Ограничить общий доступ группами пользователя", "Log" => "Журнал", "More" => "Ещё", +"Developed by the ownCloud community, the source code is licensed under the AGPL." => "Разрабатывается сообществом ownCloud, исходный код доступен под лицензией AGPL.", "Add your App" => "Добавить приложение", "Select an App" => "Выберите приложение", "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com", +"-licensed by " => " лицензия. Автор ", "Documentation" => "Документация", "Managing Big Files" => "Управление большими файлами", "Ask a question" => "Задать вопрос", From f23f719d99f43138739d3a77e2d63fede43e9687 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 8 Sep 2012 20:15:35 -0400 Subject: [PATCH 020/205] Fix unsharing from self for group shares and add test for it --- lib/public/share.php | 20 +++++++++++++++++--- tests/lib/share/share.php | 8 ++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/lib/public/share.php b/lib/public/share.php index cf61681424..a3cfe4f6dd 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -337,10 +337,21 @@ class Share { public static function unshareFromSelf($itemType, $itemTarget) { if ($item = self::getItemSharedWith($itemType, $itemTarget)) { if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) { - // TODO + // Insert an extra row for the group share and set permission to 0 to prevent it from showing up for the user + $query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_type`, `item_source`, `item_target`, `parent`, `share_type`, `share_with`, `uid_owner`, `permissions`, `stime`, `file_source`, `file_target`) VALUES (?,?,?,?,?,?,?,?,?,?,?)'); + $query->execute(array($item['item_type'], $item['item_source'], $item['item_target'], $item['id'], self::$shareTypeGroupUserUnique, \OC_User::getUser(), $item['uid_owner'], 0, $item['stime'], $item['file_source'], $item['file_target'])); + \OC_DB::insertid('*PREFIX*share'); + // Delete all reshares by this user of the group share + self::delete($item['id'], true, \OC_User::getUser()); + } else if ((int)$item['share_type'] === self::$shareTypeGroupUserUnique) { + // Set permission to 0 to prevent it from showing up for the user + $query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?'); + $query->execute(array(0, $item['id'])); + self::delete($item['id'], true); + } else { + self::delete($item['id']); } - // Delete - return self::delete($item['id']); + return true; } return false; } @@ -629,6 +640,9 @@ class Share { $row['share_with'] = $items[$row['parent']]['share_with']; // Remove the parent group share unset($items[$row['parent']]); + if ($row['permissions'] == 0) { + continue; + } } else if (!isset($uidOwner)) { // Check if the same target already exists if (isset($targets[$row[$column]])) { diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php index b45779038b..b2fecdc8bf 100644 --- a/tests/lib/share/share.php +++ b/tests/lib/share/share.php @@ -249,6 +249,7 @@ class Test_Share extends UnitTestCase { $this->assertTrue(in_array('test1.txt', $to_test)); // Remove user + OC_User::setUserId($this->user1); OC_User::deleteUser($this->user1); OC_User::setUserId($this->user2); $this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test1.txt')); @@ -383,8 +384,15 @@ class Test_Share extends UnitTestCase { OC_Group::addToGroup($this->user4, $this->group1); $this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt')); + // Unshare from self + $this->assertTrue(OCP\Share::unshareFromSelf('test', 'test.txt')); + $this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array()); + OC_User::setUserId($this->user2); + $this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt')); + // Remove group OC_Group::deleteGroup($this->group1); + OC_User::setUserId($this->user4); $this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array()); OC_User::setUserId($this->user3); $this->assertEqual(OCP\Share::getItemsShared('test'), array()); From 0b2633a787b8c5944962f02740abf1f75b9035e0 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 9 Sep 2012 02:58:16 +0200 Subject: [PATCH 021/205] add breadcrumb controll to js --- core/js/js.js | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/core/js/js.js b/core/js/js.js index afc0732d66..e3c3716e05 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -244,6 +244,49 @@ OC.search.lastResults={}; OC.addStyle.loaded=[]; OC.addScript.loaded=[]; +OC.Breadcrumb={ + container:null, + crumbs:[], + push:function(name, link){ + if(!OC.Breadcrumb.container){//default + OC.Breadcrumb.container=$('#controls'); + } + var crumb=$('
'); + crumb.addClass('crumb').addClass('last'); + crumb.attr('style','background-image:url("'+OC.imagePath('core','breadcrumb')+'")'); + + var crumbLink=$(''); + crumbLink.attr('href',link); + crumbLink.text(name); + crumb.append(crumbLink); + + var existing=OC.Breadcrumb.container.find('div.crumb'); + if(existing.length){ + existing.removeClass('last'); + existing.last().after(crumb); + }else{ + OC.Breadcrumb.container.append(crumb); + } + OC.Breadcrumb.crumbs.push(crumb); + return crumb; + }, + pop:function(){ + if(!OC.Breadcrumb.container){//default + OC.Breadcrumb.container=$('#controls'); + } + OC.Breadcrumb.container.find('div.crumb').last().remove(); + OC.Breadcrumb.container.find('div.crumb').last().addClass('last'); + OC.Breadcrumb.crumbs.pop(); + }, + clear:function(){ + if(!OC.Breadcrumb.container){//default + OC.Breadcrumb.container=$('#controls'); + } + OC.Breadcrumb.container.find('div.crumb').remove(); + OC.Breadcrumb.crumbs=[]; + } +} + if(typeof localStorage !='undefined' && localStorage != null){ //user and instance awere localstorage OC.localStorage={ From a050915167cdcb0f5b99d5c0007ed9f9f25a20de Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 9 Sep 2012 02:59:43 +0200 Subject: [PATCH 022/205] move breadcrumb css to core so we can reuse it --- apps/files/css/files.css | 3 --- core/css/styles.css | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/apps/files/css/files.css b/apps/files/css/files.css index bdd35285e7..f35478ecc2 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -47,9 +47,6 @@ tbody a { color:#000; } span.extension, span.uploading, td.date { color:#999; } span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; } tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; } -div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; } -div.crumb:first-child { padding-left:1em; } -div.crumb.last { font-weight:bold; } table tr.mouseOver td { background-color:#eee; } table th { height:2em; padding:0 .5em; color:#999; } table th .name { float:left; margin-left:.5em; } diff --git a/core/css/styles.css b/core/css/styles.css index 488ac48e4b..6bf3757df2 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -169,3 +169,8 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd .arrow.left { left: -13px; bottom: 1.2em; -webkit-transform: rotate(270deg); -moz-transform: rotate(270deg); -o-transform: rotate(270deg); -ms-transform: rotate(270deg); transform: rotate(270deg); } .arrow.up { top: -8px; right: 2em; } .arrow.down { -webkit-transform: rotate(180deg); -moz-transform: rotate(180deg); -o-transform: rotate(180deg); -ms-transform: rotate(180deg); transform: rotate(180deg); } + +/* ---- BREADCRUMB ---- */ +div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; } +div.crumb:first-child { padding-left:1em; } +div.crumb.last { font-weight:bold; } From b163bd514f65999cd8aa66262d10ca92dcdf99d1 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 8 Sep 2012 23:07:43 -0400 Subject: [PATCH 023/205] Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder --- apps/files_sharing/lib/share/folder.php | 22 ++++++++++++++----- lib/public/share.php | 29 ++++++++++++++++--------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php index 665583e83a..e29e9b7e00 100644 --- a/apps/files_sharing/lib/share/folder.php +++ b/apps/files_sharing/lib/share/folder.php @@ -19,7 +19,7 @@ * License along with this library. If not, see . */ -class OC_Share_Backend_Folder extends OC_Share_Backend_File { +class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share_Backend_Collection { public function formatItems($items, $format, $parameters = null) { if ($format == self::FORMAT_SHARED_STORAGE) { @@ -50,12 +50,22 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File { } public function getChildren($itemSource) { - $files = OC_FileCache::getFolderContent($itemSource); - $sources = array(); - foreach ($files as $file) { - $sources[] = $file['path']; + $children = array(); + $parents = array($itemSource); + while (!empty($parents)) { + $parents = "'".implode("','", $parents)."'"; + $query = OC_DB::prepare('SELECT `id`, `name`, `mimetype` FROM `*PREFIX*fscache` WHERE `parent` IN ('.$parents.')'); + $result = $query->execute(); + $parents = array(); + while ($file = $result->fetchRow()) { + $children[] = array('source' => $file['id'], 'file_path' => $file['name']); + // If a child folder is found look inside it + if ($file['mimetype'] == 'httpd/unix-directory') { + $parents[] = $file['id']; + } + } } - return $sources; + return $children; } } \ No newline at end of file diff --git a/lib/public/share.php b/lib/public/share.php index a3cfe4f6dd..87144735a6 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -458,8 +458,8 @@ class Share { $collectionTypes[] = $type; } } - if (count($collectionTypes) > 1) { - unset($collectionTypes[0]); + // Return array if collections were found or the item type is a collection itself - collections can be inside collections + if (count($collectionTypes) > 1 || self::getBackend($itemType) instanceof Share_Backend_Collection) { return $collectionTypes; } return false; @@ -504,10 +504,9 @@ class Share { $root = ''; if ($includeCollections && !isset($item) && ($collectionTypes = self::getCollectionItemTypes($itemType))) { // If includeCollections is true, find collections of this item type, e.g. a music album contains songs - $itemTypes = array_merge(array($itemType), $collectionTypes); - $placeholders = join(',', array_fill(0, count($itemTypes), '?')); - $where = ' WHERE `item_type` IN ('.$placeholders.')'; - $queryArgs = $itemTypes; + $placeholders = join(',', array_fill(0, count($collectionTypes), '?')); + $where .= ' OR item_type IN ('.$placeholders.'))'; + $queryArgs = $collectionTypes; } else { $where = ' WHERE `item_type` = ?'; $queryArgs = array($itemType); @@ -690,15 +689,25 @@ class Share { } } // Check if this is a collection of the requested item type - if ($includeCollections && $row['item_type'] != $itemType) { + if ($includeCollections && in_array($row['item_type'], $collectionTypes)) { if (($collectionBackend = self::getBackend($row['item_type'])) && $collectionBackend instanceof Share_Backend_Collection) { $row['collection'] = array('item_type' => $itemType, $column => $row[$column]); // Fetch all of the children sources $children = $collectionBackend->getChildren($row[$column]); foreach ($children as $child) { $childItem = $row; - $childItem['item_source'] = $child; - // $childItem['item_target'] = $child['target']; TODO + if ($row['item_type'] != 'file' && $row['item_type'] != 'folder') { + $childItem['item_source'] = $child['source']; + $childItem['item_target'] = $child['target']; + } + if ($backend instanceof Share_Backend_File_Dependent) { + if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') { + $childItem['file_source'] = $child['source']; + } else { + $childItem['file_source'] = \OC_FileCache::getId($child['file_path']); + } + $childItem['file_target'] = $child['file_path']; + } if (isset($item)) { if ($childItem[$column] == $item) { // Return only the item instead of a 2-dimensional array @@ -1167,7 +1176,7 @@ interface Share_Backend_Collection extends Share_Backend { /** * @brief Get the sources of the children of the item * @param string Item source - * @return array Returns an array of sources + * @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable */ public function getChildren($itemSource); From fe7f095b08e765486ff3dda206b46bdb41ab7d31 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 8 Sep 2012 23:09:45 -0400 Subject: [PATCH 024/205] Insert id for unique user group share rows --- lib/public/share.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/public/share.php b/lib/public/share.php index 87144735a6..94644d0b65 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -871,6 +871,7 @@ class Share { // Insert an extra row for the group share if the item or file target is unique for this user if ($itemTarget != $groupItemTarget || (isset($fileSource) && $fileTarget != $groupFileTarget)) { $query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget)); + \OC_DB::insertid('*PREFIX*share'); } } if ($parentFolder === true) { From 3e7951e1e6d8928e1c2e47d25489635d337cac04 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sat, 8 Sep 2012 23:42:24 -0400 Subject: [PATCH 025/205] Normalize the file path for shared children as a precaution --- lib/public/share.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/public/share.php b/lib/public/share.php index 94644d0b65..5ed04c3e16 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -629,6 +629,7 @@ class Share { } $root = strlen($root); $query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit); + $result = $query->execute($queryArgs); $items = array(); $targets = array(); @@ -706,7 +707,7 @@ class Share { } else { $childItem['file_source'] = \OC_FileCache::getId($child['file_path']); } - $childItem['file_target'] = $child['file_path']; + $childItem['file_target'] = \OC_Filesystem::normalizePath($child['file_path']); } if (isset($item)) { if ($childItem[$column] == $item) { From 13d513c17c264a3bbb1b2c874bb742afbce76e10 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 9 Sep 2012 11:50:12 -0400 Subject: [PATCH 026/205] Fix shared collection item searching --- core/ajax/share.php | 2 +- lib/public/share.php | 67 +++++++++++++++++++++++++------------------- 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/core/ajax/share.php b/core/ajax/share.php index 3ace97d4d0..5b6763c08e 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -72,7 +72,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo $reshare = false; } if ($_GET['checkShares'] == 'true') { - $shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource']); + $shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true); } else { $shares = false; } diff --git a/lib/public/share.php b/lib/public/share.php index 5ed04c3e16..3e42e91d04 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -629,7 +629,6 @@ class Share { } $root = strlen($root); $query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit); - $result = $query->execute($queryArgs); $items = array(); $targets = array(); @@ -692,37 +691,47 @@ class Share { // Check if this is a collection of the requested item type if ($includeCollections && in_array($row['item_type'], $collectionTypes)) { if (($collectionBackend = self::getBackend($row['item_type'])) && $collectionBackend instanceof Share_Backend_Collection) { - $row['collection'] = array('item_type' => $itemType, $column => $row[$column]); - // Fetch all of the children sources - $children = $collectionBackend->getChildren($row[$column]); - foreach ($children as $child) { - $childItem = $row; - if ($row['item_type'] != 'file' && $row['item_type'] != 'folder') { - $childItem['item_source'] = $child['source']; - $childItem['item_target'] = $child['target']; - } - if ($backend instanceof Share_Backend_File_Dependent) { - if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') { - $childItem['file_source'] = $child['source']; - } else { - $childItem['file_source'] = \OC_FileCache::getId($child['file_path']); + // Collections can be inside collections, check if the item is a collection + if (isset($item) && $row['item_type'] == $itemType && $row[$column] == $item) { + $collectionItems[] = $row; + } else { + $row['collection'] = array('item_type' => $row['item_type'], $column => $row[$column]); + // Fetch all of the children sources + $children = $collectionBackend->getChildren($row[$column]); + foreach ($children as $child) { + $childItem = $row; + $childItem['item_type'] = $itemType; + if ($row['item_type'] != 'file' && $row['item_type'] != 'folder') { + $childItem['item_source'] = $child['source']; + $childItem['item_target'] = $child['target']; } - $childItem['file_target'] = \OC_Filesystem::normalizePath($child['file_path']); - } - if (isset($item)) { - if ($childItem[$column] == $item) { - // Return only the item instead of a 2-dimensional array - if ($limit == 1 && $format == self::FORMAT_NONE) { - return $childItem; + if ($backend instanceof Share_Backend_File_Dependent) { + if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') { + $childItem['file_source'] = $child['source']; } else { - // Unset the items array and break out of both loops - $items = array(); - $items[] = $childItem; - break 2; + $childItem['file_source'] = \OC_FileCache::getId($child['file_path']); } + $childItem['file_target'] = \OC_Filesystem::normalizePath($child['file_path']); + } + if (isset($item)) { + if ($childItem[$column] == $item) { + // Return only the item instead of a 2-dimensional array + if ($limit == 1) { + if ($format == self::FORMAT_NONE) { + return $childItem; + } else { + // Unset the items array and break out of both loops + $items = array(); + $items[] = $childItem; + break 2; + } + } else { + $collectionItems[] = $childItem; + } + } + } else { + $collectionItems[] = $childItem; } - } else { - $collectionItems[] = $childItem; } } } @@ -1182,4 +1191,4 @@ interface Share_Backend_Collection extends Share_Backend { */ public function getChildren($itemSource); -} +} \ No newline at end of file From 6c17a4cb77f50ce851ce8f3bc9a94f7f40967df0 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 9 Sep 2012 14:44:08 -0400 Subject: [PATCH 027/205] Don't display actions for children in shared collections, show the parent collection the child is shared in --- core/js/share.js | 109 +++++++++++++++++++++++++------------------ lib/public/share.php | 7 ++- 2 files changed, 70 insertions(+), 46 deletions(-) diff --git a/core/js/share.js b/core/js/share.js index b5e8b0e661..535ae6da99 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -71,7 +71,8 @@ OC.Share={ var item = itemSource; } if (typeof OC.Share.statuses[item] === 'undefined') { - checkShares = false; + // NOTE: Check doesn't always work and misses some shares, fix later + checkShares = true; } else { checkShares = true; } @@ -149,7 +150,11 @@ OC.Share={ if (share.share_type == OC.Share.SHARE_TYPE_LINK) { OC.Share.showLink(itemSource, share.share_with); } else { - OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions); + if (share.collection) { + OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection); + } else { + OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, false); + } } }); } @@ -213,56 +218,70 @@ OC.Share={ } }); }, - addShareWith:function(shareType, shareWith, permissions, possiblePermissions) { + addShareWith:function(shareType, shareWith, permissions, possiblePermissions, collection) { if (!OC.Share.itemShares[shareType]) { OC.Share.itemShares[shareType] = []; } OC.Share.itemShares[shareType].push(shareWith); - var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = ''; - if (permissions & OC.PERMISSION_CREATE) { - createChecked = 'checked="checked"'; - editChecked = 'checked="checked"'; - } - if (permissions & OC.PERMISSION_UPDATE) { - updateChecked = 'checked="checked"'; - editChecked = 'checked="checked"'; - } - if (permissions & OC.PERMISSION_DELETE) { - deleteChecked = 'checked="checked"'; - editChecked = 'checked="checked"'; - } - if (permissions & OC.PERMISSION_SHARE) { - shareChecked = 'checked="checked"'; - } - var html = '
  • '; - html += shareWith; - if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) { - if (editChecked == '') { - html += '
  • Shared in '+item+' with '+shareWith+'
    • '; + $('#shareWithList').prepend(html); + } + } else { + var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = ''; + if (permissions & OC.PERMISSION_CREATE) { + createChecked = 'checked="checked"'; + editChecked = 'checked="checked"'; + } + if (permissions & OC.PERMISSION_UPDATE) { + updateChecked = 'checked="checked"'; + editChecked = 'checked="checked"'; + } + if (permissions & OC.PERMISSION_DELETE) { + deleteChecked = 'checked="checked"'; + editChecked = 'checked="checked"'; + } + if (permissions & OC.PERMISSION_SHARE) { + shareChecked = 'checked="checked"'; + } + var html = '
  • '; + html += shareWith; + if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) { + if (editChecked == '') { + html += ''; + html += ''; + html += ''; + html += '
    • '; + $(html).appendTo('#shareWithList'); } - html += ''; - html += ''; - html += ''; - html += ''; - $(html).appendTo('#shareWithList'); - }, showLink:function(itemSource, password) { $('#linkCheckbox').attr('checked', true); diff --git a/lib/public/share.php b/lib/public/share.php index 3e42e91d04..6186c2d1c1 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -695,7 +695,12 @@ class Share { if (isset($item) && $row['item_type'] == $itemType && $row[$column] == $item) { $collectionItems[] = $row; } else { - $row['collection'] = array('item_type' => $row['item_type'], $column => $row[$column]); + $collection = array(); + $collection['item_type'] = $row['item_type']; + if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') { + $collection['path'] = basename($row['path']); + } + $row['collection'] = $collection; // Fetch all of the children sources $children = $collectionBackend->getChildren($row[$column]); foreach ($children as $child) { From 5c5955b31f25aa637edf955580508aa1a333777a Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 9 Sep 2012 14:52:03 -0400 Subject: [PATCH 028/205] Disable link sharing for folders temporarily - next release --- apps/files_sharing/js/share.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index a171751589..9d0e2c90f8 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -39,8 +39,10 @@ $(document).ready(function() { var tr = $('tr').filterAttr('data-file', filename); if ($(tr).data('type') == 'dir') { var itemType = 'folder'; + var link = false; } else { var itemType = 'file'; + var link = true; } var possiblePermissions = $(tr).data('permissions'); var appendTo = $(tr).find('td.filename'); @@ -49,14 +51,14 @@ $(document).ready(function() { if (item != $('#dropdown').data('item')) { OC.Share.hideDropDown(function () { $(tr).addClass('mouseOver'); - OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions); + OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, link, possiblePermissions); }); } else { OC.Share.hideDropDown(); } } else { $(tr).addClass('mouseOver'); - OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions); + OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, link, possiblePermissions); } }); } From deb1fbf9a1b9e3f0ac8da4ccc2c3d0e13c0d4f5a Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Sun, 9 Sep 2012 18:29:47 -0400 Subject: [PATCH 029/205] Provide update script for files sharing --- apps/files_sharing/appinfo/update.php | 53 +++++++++++++++++++++------ apps/files_sharing/appinfo/version | 2 +- apps/files_sharing/lib/share/file.php | 2 +- 3 files changed, 44 insertions(+), 13 deletions(-) diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index feafa5fb99..cb6af2d5f0 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -1,16 +1,47 @@ execute(); + $groupShares = array(); + while ($row = $result->fetchRow()) { + $itemSource = OC_FileCache::getId($row['source'], ''); + if ($itemSource != -1) { + $file = OC_FileCache::get($row['source'], ''); + if ($file['mimetype'] == 'httpd/unix-directory') { + $itemType = 'folder'; + } else { + $itemType = 'file'; } + if ($row['permissions'] == 0) { + $permissions = OCP\Share::PERMISSION_READ; + } else { + $permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE; + if ($itemType == 'folder') { + $permissions |= OCP\Share::PERMISSION_CREATE; + } + } + $pos = strrpos($row['uid_shared_with'], '@'); + if ($pos !== false && OC_Group::groupExists(substr($row['uid_shared_with'], $pos + 1))) { + $shareType = OCP\Share::SHARE_TYPE_GROUP; + $shareWith = substr($row['uid_shared_with'], 0, $pos); + if (isset($groupShares[$shareWith][$itemSource])) { + continue; + } else { + $groupShares[$shareWith][$itemSource] = true; + } + } else if ($row['uid_shared_with'] == 'public') { + $shareType = OCP\Share::SHARE_TYPE_LINK; + $shareWith = null; + } else { + $shareType = OCP\Share::SHARE_TYPE_USER; + $shareWith = $row['uid_shared_with']; + } + OC_User::setUserId($row['uid_owner']); + OCP\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions); } - closedir($handle); } + // 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/appinfo/version b/apps/files_sharing/appinfo/version index a2268e2de4..9fc80f937f 100644 --- a/apps/files_sharing/appinfo/version +++ b/apps/files_sharing/appinfo/version @@ -1 +1 @@ -0.3.1 \ No newline at end of file +0.3.2 \ No newline at end of file diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php index c8821ee0fe..2149da1d73 100644 --- a/apps/files_sharing/lib/share/file.php +++ b/apps/files_sharing/lib/share/file.php @@ -30,7 +30,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent { public function isValidSource($itemSource, $uidOwner) { $path = OC_FileCache::getPath($itemSource, $uidOwner); - if (OC_Filesystem::file_exists($path)) { + if ($path) { $this->path = $path; return true; } From bd720bdf4cd7f4c017c301e7f69c3c20862bd419 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Mon, 10 Sep 2012 02:04:59 +0200 Subject: [PATCH 030/205] [tx-robot] updated from transifex --- apps/files/l10n/cs_CZ.php | 2 +- apps/files/l10n/es.php | 2 ++ apps/files/l10n/ja_JP.php | 3 +++ apps/files/l10n/nl.php | 2 ++ apps/files_external/l10n/et_EE.php | 8 +++++++- l10n/cs_CZ/files.po | 6 +++--- l10n/es/files.po | 10 +++++----- l10n/et_EE/files_external.po | 18 +++++++++--------- l10n/ja_JP/files.po | 12 ++++++------ l10n/nl/files.po | 10 +++++----- l10n/templates/core.pot | 26 +++++++++++++------------- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- 19 files changed, 64 insertions(+), 51 deletions(-) diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php index 3269420e5a..41ef4e7849 100644 --- a/apps/files/l10n/cs_CZ.php +++ b/apps/files/l10n/cs_CZ.php @@ -16,7 +16,7 @@ "replaced" => "nahrazeno", "undo" => "zpět", "with" => "s", -"unshared" => "Sdílení zrušeno", +"unshared" => "sdílení zrušeno", "deleted" => "smazáno", "generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.", "Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů", diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php index 0ba3c56aa1..d07149d859 100644 --- a/apps/files/l10n/es.php +++ b/apps/files/l10n/es.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Falta un directorio temporal", "Failed to write to disk" => "La escritura en disco ha fallado", "Files" => "Archivos", +"Unshare" => "Dejar de compartir", "Delete" => "Eliminado", "already exists" => "ya existe", "replace" => "reemplazar", @@ -15,6 +16,7 @@ "replaced" => "reemplazado", "undo" => "deshacer", "with" => "con", +"unshared" => "no compartido", "deleted" => "borrado", "generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.", "Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes", diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php index 2de716fec8..6d278c3f0f 100644 --- a/apps/files/l10n/ja_JP.php +++ b/apps/files/l10n/ja_JP.php @@ -7,13 +7,16 @@ "Missing a temporary folder" => "テンポラリフォルダが見つかりません", "Failed to write to disk" => "ディスクへの書き込みに失敗しました", "Files" => "ファイル", +"Unshare" => "共有しない", "Delete" => "削除", "already exists" => "既に存在します", "replace" => "置き換え", +"suggest name" => "推奨名称", "cancel" => "キャンセル", "replaced" => "置換：", "undo" => "元に戻す", "with" => "←", +"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バイトのため、アップロードできません。", diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php index 515d67a76a..b54c96bd9a 100644 --- a/apps/files/l10n/nl.php +++ b/apps/files/l10n/nl.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Een tijdelijke map mist", "Failed to write to disk" => "Schrijven naar schijf mislukt", "Files" => "Bestanden", +"Unshare" => "Stop delen", "Delete" => "Verwijder", "already exists" => "bestaat al", "replace" => "vervang", @@ -15,6 +16,7 @@ "replaced" => "vervangen", "undo" => "ongedaan maken", "with" => "door", +"unshared" => "niet gedeeld", "deleted" => "verwijderd", "generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.", "Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes", diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php index a6907e775b..f47ebc936b 100644 --- a/apps/files_external/l10n/et_EE.php +++ b/apps/files_external/l10n/et_EE.php @@ -1,12 +1,18 @@ "Väline salvestuskoht", "Mount point" => "Ühenduspunkt", +"Backend" => "Admin", "Configuration" => "Seadistamine", "Options" => "Valikud", +"Applicable" => "Rakendatav", "Add mount point" => "Lisa ühenduspunkt", "None set" => "Pole määratud", "All Users" => "Kõik kasutajad", "Groups" => "Grupid", "Users" => "Kasutajad", -"Delete" => "Kustuta" +"Delete" => "Kustuta", +"SSL root certificates" => "SSL root sertifikaadid", +"Import Root Certificate" => "Impordi root sertifikaadid", +"Enable User External Storage" => "Luba kasutajatele väline salvestamine", +"Allow users to mount their own external storage" => "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed" ); diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po index 9a8fb88304..8da1d5687e 100644 --- a/l10n/cs_CZ/files.po +++ b/l10n/cs_CZ/files.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-09 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 09:02+0000\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" +"PO-Revision-Date: 2012-09-09 10:25+0000\n" "Last-Translator: Tomáš Chvátal \n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" @@ -92,7 +92,7 @@ msgstr "s" #: js/filelist.js:268 msgid "unshared" -msgstr "Sdílení zrušeno" +msgstr "sdílení zrušeno" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/es/files.po b/l10n/es/files.po index 4c7a65443d..a50f0e53fd 100644 --- a/l10n/es/files.po +++ b/l10n/es/files.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" +"PO-Revision-Date: 2012-09-09 03:24+0000\n" +"Last-Translator: juanman \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +57,7 @@ msgstr "Archivos" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Dejar de compartir" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -93,7 +93,7 @@ msgstr "con" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "no compartido" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po index 3daaecb163..e8e4379ae0 100644 --- a/l10n/et_EE/files_external.po +++ b/l10n/et_EE/files_external.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-19 02:02+0200\n" -"PO-Revision-Date: 2012-08-18 06:32+0000\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" +"PO-Revision-Date: 2012-09-09 20:19+0000\n" "Last-Translator: Rivo Zängov \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: et_EE\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:3 msgid "External Storage" @@ -28,7 +28,7 @@ msgstr "Ühenduspunkt" #: templates/settings.php:8 msgid "Backend" -msgstr "" +msgstr "Admin" #: templates/settings.php:9 msgid "Configuration" @@ -40,7 +40,7 @@ msgstr "Valikud" #: templates/settings.php:11 msgid "Applicable" -msgstr "" +msgstr "Rakendatav" #: templates/settings.php:23 msgid "Add mount point" @@ -68,16 +68,16 @@ msgstr "Kustuta" #: templates/settings.php:88 msgid "SSL root certificates" -msgstr "" +msgstr "SSL root sertifikaadid" #: templates/settings.php:102 msgid "Import Root Certificate" -msgstr "" +msgstr "Impordi root sertifikaadid" #: templates/settings.php:108 msgid "Enable User External Storage" -msgstr "" +msgstr "Luba kasutajatele väline salvestamine" #: templates/settings.php:109 msgid "Allow users to mount their own external storage" -msgstr "" +msgstr "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed" diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po index 5dec378931..6e3d70c125 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-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" +"PO-Revision-Date: 2012-09-09 05:11+0000\n" +"Last-Translator: ttyn \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" @@ -55,7 +55,7 @@ msgstr "ファイル" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "共有しない" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -71,7 +71,7 @@ msgstr "置き換え" #: js/filelist.js:186 msgid "suggest name" -msgstr "" +msgstr "推奨名称" #: js/filelist.js:186 js/filelist.js:188 msgid "cancel" @@ -91,7 +91,7 @@ msgstr "←" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "未共有" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/nl/files.po b/l10n/nl/files.po index 95befc34bd..0a77bef234 100644 --- a/l10n/nl/files.po +++ b/l10n/nl/files.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" +"PO-Revision-Date: 2012-09-09 07:08+0000\n" +"Last-Translator: Richard Bos \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" @@ -62,7 +62,7 @@ msgstr "Bestanden" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Stop delen" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -98,7 +98,7 @@ msgstr "door" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "niet gedeeld" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index c96cb3d21e..932761bdcb 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-09 02:01+0200\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -33,51 +33,51 @@ msgstr "" msgid "Settings" msgstr "" -#: js/js.js:599 +#: js/js.js:642 msgid "January" msgstr "" -#: js/js.js:599 +#: js/js.js:642 msgid "February" msgstr "" -#: js/js.js:599 +#: js/js.js:642 msgid "March" msgstr "" -#: js/js.js:599 +#: js/js.js:642 msgid "April" msgstr "" -#: js/js.js:599 +#: js/js.js:642 msgid "May" msgstr "" -#: js/js.js:599 +#: js/js.js:642 msgid "June" msgstr "" -#: js/js.js:600 +#: js/js.js:643 msgid "July" msgstr "" -#: js/js.js:600 +#: js/js.js:643 msgid "August" msgstr "" -#: js/js.js:600 +#: js/js.js:643 msgid "September" msgstr "" -#: js/js.js:600 +#: js/js.js:643 msgid "October" msgstr "" -#: js/js.js:600 +#: js/js.js:643 msgid "November" msgstr "" -#: js/js.js:600 +#: js/js.js:643 msgid "December" msgstr "" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index 58cf33ef54..bd2aaf3f74 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-09 02:01+0200\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 51d6d1bc51..357ef03faf 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-09 02:01+0200\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 8e2151c185..37669ac70f 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-09 02:01+0200\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index bdd784daef..0b0636f1de 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-09 02:01+0200\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 55b9c78549..7bc8ac862b 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-09 02:01+0200\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index bc10d0b809..3fa354b572 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-09 02:01+0200\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index a0b4c398f7..01583d6a5b 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-09 02:01+0200\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index f4c6b8245c..5df0ca0963 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-09 02:01+0200\n" +"POT-Creation-Date: 2012-09-10 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From f34588d1fffbc4d8222148b2bbb9834d943bfe3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 10 Sep 2012 12:21:54 +0300 Subject: [PATCH 031/205] Respect coding style --- lib/archive/tar.php | 66 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/lib/archive/tar.php b/lib/archive/tar.php index ebd581fc16..639d2392b6 100644 --- a/lib/archive/tar.php +++ b/lib/archive/tar.php @@ -6,7 +6,7 @@ * See the COPYING-README file. */ -require_once '3rdparty/Archive/Tar.php'; +require_once 'Archive/Tar.php'; class OC_Archive_TAR extends OC_Archive{ const PLAIN=0; @@ -24,7 +24,7 @@ class OC_Archive_TAR extends OC_Archive{ function __construct($source) { $types=array(null,'gz','bz'); $this->path=$source; - $this->tar=new Archive_Tar($source,$types[self::getTarType($source)]); + $this->tar=new Archive_Tar($source, $types[self::getTarType($source)]); } /** @@ -33,8 +33,8 @@ class OC_Archive_TAR extends OC_Archive{ * @return str */ static public function getTarType($file) { - if(strpos($file,'.')) { - $extension=substr($file,strrpos($file,'.')); + if(strpos($file, '.')) { + $extension=substr($file, strrpos($file, '.')); switch($extension) { case 'gz': case 'tgz': @@ -57,13 +57,13 @@ class OC_Archive_TAR extends OC_Archive{ */ function addFolder($path) { $tmpBase=OC_Helper::tmpFolder(); - if(substr($path,-1,1)!='/') { + if(substr($path, -1, 1)!='/') { $path.='/'; } if($this->fileExists($path)) { return false; } - $parts=explode('/',$path); + $parts=explode('/', $path); $folder=$tmpBase; foreach($parts as $part) { $folder.='/'.$part; @@ -71,7 +71,7 @@ class OC_Archive_TAR extends OC_Archive{ mkdir($folder); } } - $result=$this->tar->addModify(array($tmpBase.$path),'',$tmpBase); + $result=$this->tar->addModify(array($tmpBase.$path), '', $tmpBase); rmdir($tmpBase.$path); $this->fileList=false; return $result; @@ -90,9 +90,9 @@ class OC_Archive_TAR extends OC_Archive{ $header=array(); $dummy=''; $this->tar->_openAppend(); - $result=$this->tar->_addfile($source,$header,$dummy,$dummy,$path); + $result=$this->tar->_addfile($source, $header, $dummy, $dummy, $path); }else{ - $result=$this->tar->addString($path,$source); + $result=$this->tar->addString($path, $source); } $this->fileList=false; return $result; @@ -108,12 +108,12 @@ class OC_Archive_TAR extends OC_Archive{ //no proper way to delete, rename entire archive, rename file and remake archive $tmp=OCP\Files::tmpFolder(); $this->tar->extract($tmp); - rename($tmp.$source,$tmp.$dest); + rename($tmp.$source, $tmp.$dest); $this->tar=null; unlink($this->path); - $types=array(null,'gz','bz'); - $this->tar=new Archive_Tar($this->path,$types[self::getTarType($this->path)]); - $this->tar->createModify(array($tmp),'',$tmp.'/'); + $types=array(null, 'gz', 'bz'); + $this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]); + $this->tar->createModify(array($tmp), '', $tmp.'/'); $this->fileList=false; return true; } @@ -158,14 +158,14 @@ class OC_Archive_TAR extends OC_Archive{ $pathLength=strlen($path); foreach($files as $file) { if($file[0]=='/') { - $file=substr($file,1); + $file=substr($file, 1); } - if(substr($file,0,$pathLength)==$path and $file!=$path) { - $result=substr($file,$pathLength); - if($pos=strpos($result,'/')) { - $result=substr($result,0,$pos+1); + if(substr($file, 0, $pathLength)==$path and $file!=$path) { + $result=substr($file, $pathLength); + if($pos=strpos($result, '/')) { + $result=substr($result, 0, $pos+1); } - if(array_search($result,$folderContent)===false) { + if(array_search($result, $folderContent)===false) { $folderContent[]=$result; } } @@ -208,12 +208,12 @@ class OC_Archive_TAR extends OC_Archive{ return false; } if($this->fileExists('/'.$path)) { - $success=$this->tar->extractList(array('/'.$path),$tmp); + $success=$this->tar->extractList(array('/'.$path), $tmp); }else{ - $success=$this->tar->extractList(array($path),$tmp); + $success=$this->tar->extractList(array($path), $tmp); } if($success) { - rename($tmp.$path,$dest); + rename($tmp.$path, $dest); } OCP\Files::rmdirr($tmp); return $success; @@ -234,16 +234,16 @@ class OC_Archive_TAR extends OC_Archive{ */ function fileExists($path) { $files=$this->getFiles(); - if((array_search($path,$files)!==false) or (array_search($path.'/',$files)!==false)) { + if((array_search($path, $files)!==false) or (array_search($path.'/', $files)!==false)) { return true; }else{ $folderPath=$path; - if(substr($folderPath,-1,1)!='/') { + if(substr($folderPath, -1, 1)!='/') { $folderPath.='/'; } $pathLength=strlen($folderPath); foreach($files as $file) { - if(strlen($file)>$pathLength and substr($file,0,$pathLength)==$folderPath) { + if(strlen($file)>$pathLength and substr($file, 0, $pathLength)==$folderPath) { return true; } } @@ -272,7 +272,7 @@ class OC_Archive_TAR extends OC_Archive{ $this->tar=null; unlink($this->path); $this->reopen(); - $this->tar->createModify(array($tmp),'',$tmp); + $this->tar->createModify(array($tmp), '', $tmp); return true; } /** @@ -282,23 +282,23 @@ class OC_Archive_TAR extends OC_Archive{ * @return resource */ function getStream($path,$mode) { - if(strrpos($path,'.')!==false) { - $ext=substr($path,strrpos($path,'.')); + if(strrpos($path, '.')!==false) { + $ext=substr($path, strrpos($path, '.')); }else{ $ext=''; } $tmpFile=OCP\Files::tmpFile($ext); if($this->fileExists($path)) { - $this->extractFile($path,$tmpFile); + $this->extractFile($path, $tmpFile); }elseif($mode=='r' or $mode=='rb') { return false; } if($mode=='r' or $mode=='rb') { - return fopen($tmpFile,$mode); + return fopen($tmpFile, $mode); }else{ OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); self::$tempFiles[$tmpFile]=$path; - return fopen('close://'.$tmpFile,$mode); + return fopen('close://'.$tmpFile, $mode); } } @@ -308,7 +308,7 @@ class OC_Archive_TAR extends OC_Archive{ */ function writeBack($tmpFile) { if(isset(self::$tempFiles[$tmpFile])) { - $this->addFile(self::$tempFiles[$tmpFile],$tmpFile); + $this->addFile(self::$tempFiles[$tmpFile], $tmpFile); unlink($tmpFile); } } @@ -322,6 +322,6 @@ class OC_Archive_TAR extends OC_Archive{ $this->tar=null; } $types=array(null,'gz','bz'); - $this->tar=new Archive_Tar($this->path,$types[self::getTarType($this->path)]); + $this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]); } } From 87e1a27fde1267921e0b4a025fec96395d83b6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 10 Sep 2012 12:23:55 +0300 Subject: [PATCH 032/205] Respect coding style --- lib/archive/zip.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/archive/zip.php b/lib/archive/zip.php index 45992ee3d8..a2b07f1a35 100644 --- a/lib/archive/zip.php +++ b/lib/archive/zip.php @@ -16,9 +16,9 @@ class OC_Archive_ZIP extends OC_Archive{ function __construct($source) { $this->path=$source; $this->zip=new ZipArchive(); - if($this->zip->open($source,ZipArchive::CREATE)) { + if($this->zip->open($source, ZipArchive::CREATE)) { }else{ - OCP\Util::writeLog('files_archive','Error while opening archive '.$source,OCP\Util::WARN); + OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, OCP\Util::WARN); } } /** @@ -37,9 +37,9 @@ class OC_Archive_ZIP extends OC_Archive{ */ function addFile($path,$source='') { if($source and $source[0]=='/' and file_exists($source)) { - $result=$this->zip->addFile($source,$path); + $result=$this->zip->addFile($source, $path); }else{ - $result=$this->zip->addFromString($path,$source); + $result=$this->zip->addFromString($path, $source); } if($result) { $this->zip->close();//close and reopen to save the zip @@ -56,7 +56,7 @@ class OC_Archive_ZIP extends OC_Archive{ function rename($source,$dest) { $source=$this->stripPath($source); $dest=$this->stripPath($dest); - $this->zip->renameName($source,$dest); + $this->zip->renameName($source, $dest); } /** * get the uncompressed size of a file in the archive @@ -85,9 +85,9 @@ class OC_Archive_ZIP extends OC_Archive{ $folderContent=array(); $pathLength=strlen($path); foreach($files as $file) { - if(substr($file,0,$pathLength)==$path and $file!=$path) { - if(strrpos(substr($file,0,-1),'/')<=$pathLength) { - $folderContent[]=substr($file,$pathLength); + if(substr($file, 0, $pathLength)==$path and $file!=$path) { + if(strrpos(substr($file, 0, -1),'/')<=$pathLength) { + $folderContent[]=substr($file, $pathLength); } } } @@ -121,7 +121,7 @@ class OC_Archive_ZIP extends OC_Archive{ */ function extractFile($path,$dest) { $fp = $this->zip->getStream($path); - file_put_contents($dest,$fp); + file_put_contents($dest, $fp); } /** * extract the archive @@ -162,18 +162,18 @@ class OC_Archive_ZIP extends OC_Archive{ if($mode=='r' or $mode=='rb') { return $this->zip->getStream($path); }else{//since we cant directly get a writable stream, make a temp copy of the file and put it back in the archive when the stream is closed - if(strrpos($path,'.')!==false) { - $ext=substr($path,strrpos($path,'.')); + if(strrpos($path, '.')!==false) { + $ext=substr($path, strrpos($path, '.')); }else{ $ext=''; } $tmpFile=OCP\Files::tmpFile($ext); OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack'); if($this->fileExists($path)) { - $this->extractFile($path,$tmpFile); + $this->extractFile($path, $tmpFile); } self::$tempFiles[$tmpFile]=$path; - return fopen('close://'.$tmpFile,$mode); + return fopen('close://'.$tmpFile, $mode); } } @@ -183,14 +183,14 @@ class OC_Archive_ZIP extends OC_Archive{ */ function writeBack($tmpFile) { if(isset(self::$tempFiles[$tmpFile])) { - $this->addFile(self::$tempFiles[$tmpFile],$tmpFile); + $this->addFile(self::$tempFiles[$tmpFile], $tmpFile); unlink($tmpFile); } } private function stripPath($path) { if(!$path || $path[0]=='/') { - return substr($path,1); + return substr($path, 1); }else{ return $path; } From 23f348c99fccb38779985d8cee2c3e7ae7e43e5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 10 Sep 2012 12:25:42 +0300 Subject: [PATCH 033/205] Respect coding style --- lib/cache/file.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cache/file.php b/lib/cache/file.php index a4f83f76c9..27d8b19f36 100644 --- a/lib/cache/file.php +++ b/lib/cache/file.php @@ -22,7 +22,7 @@ class OC_Cache_File{ $this->storage = new OC_FilesystemView('/'.OC_User::getUser().'/'.$subdir); return $this->storage; }else{ - OC_Log::write('core','Can\'t get cache storage, user not logged in', OC_Log::ERROR); + OC_Log::write('core', 'Can\'t get cache storage, user not logged in', OC_Log::ERROR); return false; } } From 9a2bc5255bbf0a80ab1c4269d2b308b3ba6377d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 10 Sep 2012 12:26:20 +0300 Subject: [PATCH 034/205] Respect coding style --- lib/cache/xcache.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php index 0739e4a2fa..cecdf46351 100644 --- a/lib/cache/xcache.php +++ b/lib/cache/xcache.php @@ -29,9 +29,9 @@ class OC_Cache_XCache { public function set($key, $value, $ttl=0) { if($ttl>0) { - return xcache_set($this->getNamespace().$key,$value,$ttl); + return xcache_set($this->getNamespace().$key, $value, $ttl); }else{ - return xcache_set($this->getNamespace().$key,$value); + return xcache_set($this->getNamespace().$key, $value); } } From 2271a9799282b5dde00a49a291b0f5f11de0358e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 10 Sep 2012 12:28:09 +0300 Subject: [PATCH 035/205] Respect coding style --- lib/connector/sabre/principal.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php index cfc72eda9f..ee95ae6330 100644 --- a/lib/connector/sabre/principal.php +++ b/lib/connector/sabre/principal.php @@ -66,7 +66,7 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend { */ public function getGroupMemberSet($principal) { // TODO: for now the group principal has only one member, the user itself - list($prefix,$name) = Sabre_DAV_URLUtil::splitPath($principal); + list($prefix, $name) = Sabre_DAV_URLUtil::splitPath($principal); $principal = $this->getPrincipalByPath($prefix); if (!$principal) throw new Sabre_DAV_Exception('Principal not found'); @@ -115,6 +115,12 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend { public function setGroupMemberSet($principal, array $members) { throw new Sabre_DAV_Exception('Setting members of the group is not supported yet'); } - function updatePrincipal($path, $mutations) {return 0;} - function searchPrincipals($prefixPath, array $searchProperties) {return 0;} + + function updatePrincipal($path, $mutations) { + return 0; + } + + function searchPrincipals($prefixPath, array $searchProperties) { + return 0; + } } From 1a10955644b6b56431679f64a7756fe99090f837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 10 Sep 2012 12:29:35 +0300 Subject: [PATCH 036/205] Respect coding style --- lib/connector/sabre/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php index 34fc5fee50..0c34c7ea29 100644 --- a/lib/connector/sabre/auth.php +++ b/lib/connector/sabre/auth.php @@ -36,7 +36,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic { return true; } else { OC_Util::setUpFS();//login hooks may need early access to the filesystem - if(OC_User::login($username,$password)) { + if(OC_User::login($username, $password)) { OC_Util::setUpFS($username); return true; } From 5721bd27861f7119fd51711583ca68b4bcce42bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 10 Sep 2012 12:31:57 +0300 Subject: [PATCH 037/205] Respect coding style --- lib/connector/sabre/directory.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php index 8fff77ac74..39606577f6 100644 --- a/lib/connector/sabre/directory.php +++ b/lib/connector/sabre/directory.php @@ -60,7 +60,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa } } else { $newPath = $this->path . '/' . $name; - OC_Filesystem::file_put_contents($newPath,$data); + OC_Filesystem::file_put_contents($newPath, $data); return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath); } @@ -195,10 +195,9 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa */ public function getProperties($properties) { $props = parent::getProperties($properties); - if (in_array(self::GETETAG_PROPERTYNAME, $properties) - && !isset($props[self::GETETAG_PROPERTYNAME])) { - $props[self::GETETAG_PROPERTYNAME] = - OC_Connector_Sabre_Node::getETagPropertyForPath($this->path); + if (in_array(self::GETETAG_PROPERTYNAME, $properties) && !isset($props[self::GETETAG_PROPERTYNAME])) { + $props[self::GETETAG_PROPERTYNAME] + = OC_Connector_Sabre_Node::getETagPropertyForPath($this->path); } return $props; } From c6cd1b77d31be34c164e7c647507929941266d76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 10 Sep 2012 12:32:49 +0300 Subject: [PATCH 038/205] Respect coding style --- lib/filecache/cached.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php index 261bd2f572..4e8ff23793 100644 --- a/lib/filecache/cached.php +++ b/lib/filecache/cached.php @@ -22,7 +22,7 @@ class OC_FileCache_Cached{ $result=$query->execute(array(md5($path)))->fetchRow(); if(is_array($result)) { if(isset(self::$savedData[$path])) { - $result=array_merge($result,self::$savedData[$path]); + $result=array_merge($result, self::$savedData[$path]); } return $result; }else{ @@ -54,7 +54,7 @@ class OC_FileCache_Cached{ if($root===false) { $root=OC_Filesystem::getRoot(); } - $parent=OC_FileCache::getId($path,$root); + $parent=OC_FileCache::getId($path, $root); if($parent==-1) { return array(); } @@ -63,7 +63,7 @@ class OC_FileCache_Cached{ if(is_array($result)) { return $result; }else{ - OC_Log::write('files','getFolderContent(): file not found in cache ('.$path.')',OC_Log::DEBUG); + OC_Log::write('files', 'getFolderContent(): file not found in cache ('.$path.')', OC_Log::DEBUG); return false; } } From 04448772189b74892fdacecce3ce78f71f774760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 10 Sep 2012 12:35:15 +0300 Subject: [PATCH 039/205] Respect coding style --- lib/filecache/update.php | 52 ++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/filecache/update.php b/lib/filecache/update.php index 3d10f5ea7b..2b64a2a90f 100644 --- a/lib/filecache/update.php +++ b/lib/filecache/update.php @@ -27,13 +27,13 @@ class OC_FileCache_Update{ if(!$view->file_exists($path)) { return false; } - $cachedData=OC_FileCache_Cached::get($path,$root); + $cachedData=OC_FileCache_Cached::get($path, $root); if(isset($cachedData['mtime'])) { $cachedMTime=$cachedData['mtime']; if($folder) { - return $view->hasUpdated($path.'/',$cachedMTime); + return $view->hasUpdated($path.'/', $cachedMTime); }else{ - return $view->hasUpdated($path,$cachedMTime); + return $view->hasUpdated($path, $cachedMTime); } }else{//file not in cache, so it has to be updated if(($path=='/' or $path=='') and $root===false) {//dont auto update the home folder, it will be scanned @@ -59,9 +59,9 @@ class OC_FileCache_Update{ $file=$view->getRelativePath($path); if(!$view->file_exists($file)) { if($root===false) {//filesystem hooks are only valid for the default root - OC_Hook::emit('OC_Filesystem','post_delete',array('path'=>$file)); + OC_Hook::emit('OC_Filesystem', 'post_delete', array('path'=>$file)); }else{ - self::delete($file,$root); + self::delete($file, $root); } } } @@ -83,24 +83,24 @@ class OC_FileCache_Update{ while (($filename = readdir($dh)) !== false) { if($filename != '.' and $filename != '..') { $file=$path.'/'.$filename; - if(self::hasUpdated($file,$root)) { + if(self::hasUpdated($file, $root)) { if($root===false) {//filesystem hooks are only valid for the default root - OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$file)); + OC_Hook::emit('OC_Filesystem', 'post_write', array('path'=>$file)); }else{ - self::update($file,$root); + self::update($file, $root); } } } } } - self::cleanFolder($path,$root); + self::cleanFolder($path, $root); //update the folder last, so we can calculate the size correctly if($root===false) {//filesystem hooks are only valid for the default root - OC_Hook::emit('OC_Filesystem','post_write',array('path'=>$path)); + OC_Hook::emit('OC_Filesystem', 'post_write', array('path'=>$path)); }else{ - self::update($path,$root); + self::update($path, $root); } } @@ -132,7 +132,7 @@ class OC_FileCache_Update{ public static function fileSystemWatcherRename($params) { $oldPath=$params['oldpath']; $newPath=$params['newpath']; - self::rename($oldPath,$newPath); + self::rename($oldPath, $newPath); } /** @@ -154,24 +154,24 @@ class OC_FileCache_Update{ $cachedSize=isset($cached['size'])?$cached['size']:0; if($view->is_dir($path.'/')) { - if(OC_FileCache::inCache($path,$root)) { - $cachedContent=OC_FileCache_Cached::getFolderContent($path,$root); + if(OC_FileCache::inCache($path, $root)) { + $cachedContent=OC_FileCache_Cached::getFolderContent($path, $root); foreach($cachedContent as $file) { $size+=$file['size']; } $mtime=$view->filemtime($path.'/'); $ctime=$view->filectime($path.'/'); $writable=$view->is_writable($path.'/'); - OC_FileCache::put($path,array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable)); + OC_FileCache::put($path, array('size'=>$size,'mtime'=>$mtime,'ctime'=>$ctime,'mimetype'=>$mimetype,'writable'=>$writable)); }else{ $count=0; - OC_FileCache::scan($path,null,$count,$root); + OC_FileCache::scan($path, null, $count, $root); return; //increaseSize is already called inside scan } }else{ - $size=OC_FileCache::scanFile($path,$root); + $size=OC_FileCache::scanFile($path, $root); } - OC_FileCache::increaseSize(dirname($path),$size-$cachedSize,$root); + OC_FileCache::increaseSize(dirname($path), $size-$cachedSize, $root); } /** @@ -180,13 +180,13 @@ class OC_FileCache_Update{ * @param string root (optional) */ public static function delete($path,$root=false) { - $cached=OC_FileCache_Cached::get($path,$root); + $cached=OC_FileCache_Cached::get($path, $root); if(!isset($cached['size'])) { return; } $size=$cached['size']; - OC_FileCache::increaseSize(dirname($path),-$size,$root); - OC_FileCache::delete($path,$root); + OC_FileCache::increaseSize(dirname($path), -$size, $root); + OC_FileCache::delete($path, $root); } /** @@ -196,7 +196,7 @@ class OC_FileCache_Update{ * @param string root (optional) */ public static function rename($oldPath,$newPath,$root=false) { - if(!OC_FileCache::inCache($oldPath,$root)) { + if(!OC_FileCache::inCache($oldPath, $root)) { return; } if($root===false) { @@ -205,10 +205,10 @@ class OC_FileCache_Update{ $view=new OC_FilesystemView($root); } - $cached=OC_FileCache_Cached::get($oldPath,$root); + $cached=OC_FileCache_Cached::get($oldPath, $root); $oldSize=$cached['size']; - OC_FileCache::increaseSize(dirname($oldPath),-$oldSize,$root); - OC_FileCache::increaseSize(dirname($newPath),$oldSize,$root); - OC_FileCache::move($oldPath,$newPath); + OC_FileCache::increaseSize(dirname($oldPath), -$oldSize, $root); + OC_FileCache::increaseSize(dirname($newPath), $oldSize, $root); + OC_FileCache::move($oldPath, $newPath); } } \ No newline at end of file From 5a65c5a46cdf624d143c02af8e2fd9ef9e1e9cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Mon, 10 Sep 2012 14:59:08 +0300 Subject: [PATCH 040/205] Respect coding style --- lib/ocs.php | 170 +++++++++++++++++++++++++--------------------------- 1 file changed, 82 insertions(+), 88 deletions(-) diff --git a/lib/ocs.php b/lib/ocs.php index 3a9be4cf09..7350c3c882 100644 --- a/lib/ocs.php +++ b/lib/ocs.php @@ -84,7 +84,7 @@ class OC_OCS { $method='get'; }elseif($_SERVER['REQUEST_METHOD'] == 'PUT') { $method='put'; - parse_str(file_get_contents("php://input"),$put_vars); + parse_str(file_get_contents("php://input"), $put_vars); }elseif($_SERVER['REQUEST_METHOD'] == 'POST') { $method='post'; }else{ @@ -94,8 +94,8 @@ class OC_OCS { // preprocess url $url = strtolower($_SERVER['REQUEST_URI']); - if(substr($url,(strlen($url)-1))<>'/') $url.='/'; - $ex=explode('/',$url); + if(substr($url, (strlen($url)-1))<>'/') $url.='/'; + $ex=explode('/', $url); $paracount=count($ex); $format = self::readData($method, 'format', 'text', ''); @@ -107,23 +107,23 @@ class OC_OCS { // PERSON // personcheck - POST - PERSON/CHECK - }elseif(($method=='post') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-3]=='person') and ($ex[$paracount-2] == 'check')) { + } elseif(($method=='post') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-3]=='person') and ($ex[$paracount-2] == 'check')) { $login = self::readData($method, 'login', 'text'); $passwd = self::readData($method, 'password', 'text'); - OC_OCS::personcheck($format,$login,$passwd); + OC_OCS::personcheck($format, $login, $passwd); // ACTIVITY // activityget - GET ACTIVITY page,pagesize als urlparameter }elseif(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')) { $page = self::readData($method, 'page', 'int', 0); - $pagesize = self::readData($method, 'pagesize','int', 10); + $pagesize = self::readData($method, 'pagesize', 'int', 10); if($pagesize<1 or $pagesize>100) $pagesize=10; - OC_OCS::activityget($format,$page,$pagesize); + OC_OCS::activityget($format, $page, $pagesize); // activityput - POST ACTIVITY }elseif(($method=='post') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')) { $message = self::readData($method, 'message', 'text'); - OC_OCS::activityput($format,$message); + OC_OCS::activityput($format, $message); // PRIVATEDATA @@ -138,7 +138,7 @@ class OC_OCS { $key=$ex[$paracount-2]; $app=$ex[$paracount-3]; - OC_OCS::privateDataGet($format, $app,$key); + OC_OCS::privateDataGet($format, $app, $key); // set - POST DATA }elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'setattribute')) { @@ -160,23 +160,23 @@ class OC_OCS { // quotaget }elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'quota')) { $user=$ex[$paracount-3]; - OC_OCS::quotaget($format,$user); + OC_OCS::quotaget($format, $user); // quotaset }elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'quota')) { $user=$ex[$paracount-3]; $quota = self::readData('post', 'quota', 'int'); - OC_OCS::quotaset($format,$user,$quota); + OC_OCS::quotaset($format, $user, $quota); // keygetpublic }elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'publickey')) { $user=$ex[$paracount-3]; - OC_OCS::publicKeyGet($format,$user); + OC_OCS::publicKeyGet($format, $user); // keygetprivate }elseif(($method=='get') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-5]=='cloud') and ($ex[$paracount-4] == 'user') and ($ex[$paracount-2] == 'privatekey')) { $user=$ex[$paracount-3]; - OC_OCS::privateKeyGet($format,$user); + OC_OCS::privateKeyGet($format, $user); // add more calls here @@ -196,7 +196,7 @@ class OC_OCS { }else{ $txt='Invalid query, please check the syntax. API specifications are here: http://www.freedesktop.org/wiki/Specifications/open-collaboration-services. DEBUG OUTPUT:'."\n"; $txt.=OC_OCS::getdebugoutput(); - echo(OC_OCS::generatexml($format,'failed',999,$txt)); + echo(OC_OCS::generatexml($format, 'failed', 999, $txt)); } exit(); } @@ -237,7 +237,7 @@ class OC_OCS { $identifieduser=''; } }else{ - if(!OC_User::login($authuser,$authpw)) { + if(!OC_User::login($authuser, $authpw)) { if($forceuser) { header('WWW-Authenticate: Basic realm="your valid user account or api key"'); header('HTTP/1.0 401 Unauthorized'); @@ -283,69 +283,69 @@ class OC_OCS { $writer = xmlwriter_open_memory(); xmlwriter_set_indent( $writer, 2 ); xmlwriter_start_document($writer ); - xmlwriter_start_element($writer,'ocs'); - xmlwriter_start_element($writer,'meta'); - xmlwriter_write_element($writer,'status',$status); - xmlwriter_write_element($writer,'statuscode',$statuscode); - xmlwriter_write_element($writer,'message',$message); + xmlwriter_start_element($writer, 'ocs'); + xmlwriter_start_element($writer, 'meta'); + xmlwriter_write_element($writer, 'status', $status); + xmlwriter_write_element($writer, 'statuscode', $statuscode); + xmlwriter_write_element($writer, 'message', $message); if($itemscount<>'') xmlwriter_write_element($writer,'totalitems',$itemscount); - if(!empty($itemsperpage)) xmlwriter_write_element($writer,'itemsperpage',$itemsperpage); + if(!empty($itemsperpage)) xmlwriter_write_element($writer, 'itemsperpage', $itemsperpage); xmlwriter_end_element($writer); if($dimension=='0') { // 0 dimensions - xmlwriter_write_element($writer,'data',$data); + xmlwriter_write_element($writer, 'data', $data); }elseif($dimension=='1') { - xmlwriter_start_element($writer,'data'); + xmlwriter_start_element($writer, 'data'); foreach($data as $key=>$entry) { - xmlwriter_write_element($writer,$key,$entry); + xmlwriter_write_element($writer, $key, $entry); } xmlwriter_end_element($writer); }elseif($dimension=='2') { xmlwriter_start_element($writer,'data'); foreach($data as $entry) { - xmlwriter_start_element($writer,$tag); - if(!empty($tagattribute)) { - xmlwriter_write_attribute($writer,'details',$tagattribute); - } - foreach($entry as $key=>$value) { - if(is_array($value)) { - foreach($value as $k=>$v) { - xmlwriter_write_element($writer,$k,$v); - } - } else { - xmlwriter_write_element($writer,$key,$value); - } - } - xmlwriter_end_element($writer); - } + xmlwriter_start_element($writer, $tag); + if(!empty($tagattribute)) { + xmlwriter_write_attribute($writer, 'details', $tagattribute); + } + foreach($entry as $key=>$value) { + if(is_array($value)) { + foreach($value as $k=>$v) { + xmlwriter_write_element($writer, $k, $v); + } + } else { + xmlwriter_write_element($writer, $key, $value); + } + } + xmlwriter_end_element($writer); + } xmlwriter_end_element($writer); }elseif($dimension=='3') { - xmlwriter_start_element($writer,'data'); + xmlwriter_start_element($writer, 'data'); foreach($data as $entrykey=>$entry) { - xmlwriter_start_element($writer,$tag); - if(!empty($tagattribute)) { - xmlwriter_write_attribute($writer,'details',$tagattribute); - } - foreach($entry as $key=>$value) { - if(is_array($value)) { - xmlwriter_start_element($writer,$entrykey); - foreach($value as $k=>$v) { - xmlwriter_write_element($writer,$k,$v); - } - xmlwriter_end_element($writer); - } else { - xmlwriter_write_element($writer,$key,$value); - } - } - xmlwriter_end_element($writer); + xmlwriter_start_element($writer, $tag); + if(!empty($tagattribute)) { + xmlwriter_write_attribute($writer, 'details', $tagattribute); + } + foreach($entry as $key=>$value) { + if(is_array($value)) { + xmlwriter_start_element($writer, $entrykey); + foreach($value as $k=>$v) { + xmlwriter_write_element($writer, $k, $v); + } + xmlwriter_end_element($writer); + } else { + xmlwriter_write_element($writer, $key, $value); + } + } + xmlwriter_end_element($writer); } xmlwriter_end_element($writer); }elseif($dimension=='dynamic') { - xmlwriter_start_element($writer,'data'); - OC_OCS::toxml($writer,$data,'comment'); + xmlwriter_start_element($writer, 'data'); + OC_OCS::toxml($writer, $data, 'comment'); xmlwriter_end_element($writer); } @@ -364,18 +364,15 @@ class OC_OCS { $key = $node; } if (is_array($value)) { - xmlwriter_start_element($writer,$key); - OC_OCS::toxml($writer,$value,$node); + xmlwriter_start_element($writer, $key); + OC_OCS::toxml($writer,$value, $node); xmlwriter_end_element($writer); }else{ - xmlwriter_write_element($writer,$key,$value); + xmlwriter_write_element($writer, $key, $value); } } } - - - /** * return the config data of this server * @param string $format @@ -383,17 +380,16 @@ class OC_OCS { */ private static function apiConfig($format) { $user=OC_OCS::checkpassword(false); - $url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'],0,-11).''; + $url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'], 0, -11).''; $xml['version']='1.7'; $xml['website']='ownCloud'; $xml['host']=OCP\Util::getServerHost(); $xml['contact']=''; $xml['ssl']='false'; - echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'config','',1)); + echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'config', '', 1)); } - /** * check if the provided login/apikey/password is valid * @param string $format @@ -403,19 +399,17 @@ class OC_OCS { */ private static function personCheck($format,$login,$passwd) { if($login<>'') { - if(OC_User::login($login,$passwd)) { + if(OC_User::login($login, $passwd)) { $xml['person']['personid']=$login; - echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'person','check',2)); + echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'person', 'check', 2)); }else{ - echo(OC_OCS::generatexml($format,'failed',102,'login not valid')); + echo(OC_OCS::generatexml($format, 'failed', 102, 'login not valid')); } }else{ - echo(OC_OCS::generatexml($format,'failed',101,'please specify all mandatory fields')); + echo(OC_OCS::generatexml($format, 'failed', 101, 'please specify all mandatory fields')); } } - - // ACTIVITY API ############################################# /** @@ -425,12 +419,12 @@ class OC_OCS { * @param string $pagesize * @return string xml/json */ - private static function activityGet($format,$page,$pagesize) { + private static function activityGet($format, $page, $pagesize) { $user=OC_OCS::checkpassword(); //TODO - $txt=OC_OCS::generatexml($format,'ok',100,'',$xml,'activity','full',2,$totalcount,$pagesize); + $txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'activity', 'full', 2, $totalcount,$pagesize); echo($txt); } @@ -443,7 +437,7 @@ class OC_OCS { private static function activityPut($format,$message) { // not implemented in ownCloud $user=OC_OCS::checkpassword(); - echo(OC_OCS::generatexml($format,'ok',100,'')); + echo(OC_OCS::generatexml($format, 'ok', 100, '')); } // PRIVATEDATA API ############################################# @@ -455,9 +449,9 @@ class OC_OCS { * @param string $key * @return string xml/json */ - private static function privateDataGet($format,$app="",$key="") { + private static function privateDataGet($format, $app="", $key="") { $user=OC_OCS::checkpassword(); - $result=OC_OCS::getData($user,$app,$key); + $result=OC_OCS::getData($user, $app, $key); $xml=array(); foreach($result as $i=>$log) { $xml[$i]['key']=$log['key']; @@ -480,8 +474,8 @@ class OC_OCS { */ private static function privateDataSet($format, $app, $key, $value) { $user=OC_OCS::checkpassword(); - if(OC_OCS::setData($user,$app,$key,$value)) { - echo(OC_OCS::generatexml($format,'ok',100,'')); + if(OC_OCS::setData($user, $app, $key, $value)) { + echo(OC_OCS::generatexml($format, 'ok', 100, '')); } } @@ -497,8 +491,8 @@ class OC_OCS { return; //key and app are NOT optional here } $user=OC_OCS::checkpassword(); - if(OC_OCS::deleteData($user,$app,$key)) { - echo(OC_OCS::generatexml($format,'ok',100,'')); + if(OC_OCS::deleteData($user, $app, $key)) { + echo(OC_OCS::generatexml($format, 'ok', 100, '')); } } @@ -510,7 +504,7 @@ class OC_OCS { * @param bool $like use LIKE instead of = when comparing keys * @return array */ - public static function getData($user,$app="",$key="") { + public static function getData($user, $app="", $key="") { if($app) { $apps=array($app); }else{ @@ -520,14 +514,14 @@ class OC_OCS { $keys=array($key); }else{ foreach($apps as $app) { - $keys=OC_Preferences::getKeys($user,$app); + $keys=OC_Preferences::getKeys($user, $app); } } $result=array(); foreach($apps as $app) { foreach($keys as $key) { - $value=OC_Preferences::getValue($user,$app,$key); - $result[]=array('app'=>$app,'key'=>$key,'value'=>$value); + $value=OC_Preferences::getValue($user, $app, $key); + $result[]=array('app'=>$app, 'key'=>$key, 'value'=>$value); } } return $result; @@ -542,7 +536,7 @@ class OC_OCS { * @return bool */ public static function setData($user, $app, $key, $value) { - return OC_Preferences::setValue($user,$app,$key,$value); + return OC_Preferences::setValue($user, $app, $key, $value); } /** @@ -553,7 +547,7 @@ class OC_OCS { * @return string xml/json */ public static function deleteData($user, $app, $key) { - return OC_Preferences::deleteKey($user,$app,$key); + return OC_Preferences::deleteKey($user, $app, $key); } From db7a18455f938e580e4788c5806a4797d8214a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 10 Sep 2012 14:14:36 +0200 Subject: [PATCH 041/205] use tabs for indentation --- lib/setup.php | 344 +++++++++++++++++++++++++------------------------- 1 file changed, 172 insertions(+), 172 deletions(-) diff --git a/lib/setup.php b/lib/setup.php index f27254a42a..67346799fe 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -9,7 +9,7 @@ $opts = array( 'hasSQLite' => $hasSQLite, 'hasMySQL' => $hasMySQL, 'hasPostgreSQL' => $hasPostgreSQL, - 'hasOracle' => $hasOracle, + 'hasOracle' => $hasOracle, 'directory' => $datadir, 'errors' => array(), ); @@ -51,10 +51,10 @@ class OC_Setup { if($dbtype=='mysql' or $dbtype == 'pgsql' or $dbtype == 'oci') { //mysql and postgresql needs more config options if($dbtype=='mysql') $dbprettyname = 'MySQL'; - else if($dbtype=='pgsql') - $dbprettyname = 'PostgreSQL'; - else - $dbprettyname = 'Oracle'; + else if($dbtype=='pgsql') + $dbprettyname = 'PostgreSQL'; + else + $dbprettyname = 'Oracle'; if(empty($options['dbuser'])) { @@ -232,117 +232,117 @@ class OC_Setup { } } } - elseif($dbtype == 'oci') { - $dbuser = $options['dbuser']; - $dbpass = $options['dbpass']; - $dbname = $options['dbname']; - $dbtablespace = $options['dbtablespace']; - $dbhost = $options['dbhost']; - $dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_'; - OC_CONFIG::setValue('dbname', $dbname); - OC_CONFIG::setValue('dbtablespace', $dbtablespace); - OC_CONFIG::setValue('dbhost', $dbhost); - OC_CONFIG::setValue('dbtableprefix', $dbtableprefix); + elseif($dbtype == 'oci') { + $dbuser = $options['dbuser']; + $dbpass = $options['dbpass']; + $dbname = $options['dbname']; + $dbtablespace = $options['dbtablespace']; + $dbhost = $options['dbhost']; + $dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_'; + OC_CONFIG::setValue('dbname', $dbname); + OC_CONFIG::setValue('dbtablespace', $dbtablespace); + OC_CONFIG::setValue('dbhost', $dbhost); + OC_CONFIG::setValue('dbtableprefix', $dbtableprefix); - $e_host = addslashes($dbhost); - $e_dbname = addslashes($dbname); - //check if the database user has admin right - $connection_string = '//'.$e_host.'/'.$e_dbname; - $connection = @oci_connect($dbuser, $dbpass, $connection_string); - if(!$connection) { - $e = oci_error(); - $error[] = array( - 'error' => 'Oracle username and/or password not valid', - 'hint' => 'You need to enter either an existing account or the administrator.' - ); - return $error; - } else { - //check for roles creation rights in oracle + $e_host = addslashes($dbhost); + $e_dbname = addslashes($dbname); + //check if the database user has admin right + $connection_string = '//'.$e_host.'/'.$e_dbname; + $connection = @oci_connect($dbuser, $dbpass, $connection_string); + if(!$connection) { + $e = oci_error(); + $error[] = array( + 'error' => 'Oracle username and/or password not valid', + 'hint' => 'You need to enter either an existing account or the administrator.' + ); + return $error; + } else { + //check for roles creation rights in oracle - $query="SELECT count(*) FROM user_role_privs, role_sys_privs WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'"; - $stmt = oci_parse($connection, $query); - if (!$stmt) { - $entry='DB Error: "'.oci_last_error($connection).'"
    '; - $entry.='Offending command was: '.$query.'
    '; - echo($entry); - } - $result = oci_execute($stmt); - if($result) { - $row = oci_fetch_row($stmt); - } - if($result and $row[0] > 0) { - //use the admin login data for the new database user + $query="SELECT count(*) FROM user_role_privs, role_sys_privs WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'"; + $stmt = oci_parse($connection, $query); + if (!$stmt) { + $entry='DB Error: "'.oci_last_error($connection).'"
    '; + $entry.='Offending command was: '.$query.'
    '; + echo($entry); + } + $result = oci_execute($stmt); + if($result) { + $row = oci_fetch_row($stmt); + } + if($result and $row[0] > 0) { + //use the admin login data for the new database user - //add prefix to the oracle user name to prevent collisions - $dbusername='oc_'.$username; - //create a new password so we don't need to store the admin config in the config file - $dbpassword=md5(time().$dbpass); + //add prefix to the oracle user name to prevent collisions + $dbusername='oc_'.$username; + //create a new password so we don't need to store the admin config in the config file + $dbpassword=md5(time().$dbpass); - //oracle passwords are treated as identifiers: - // must start with aphanumeric char - // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length. - $dbpassword=substr($dbpassword, 0, 30); + //oracle passwords are treated as identifiers: + // must start with aphanumeric char + // needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length. + $dbpassword=substr($dbpassword, 0, 30); - self::oci_createDBUser($dbusername, $dbpassword, $dbtablespace, $connection); + self::oci_createDBUser($dbusername, $dbpassword, $dbtablespace, $connection); - OC_CONFIG::setValue('dbuser', $dbusername); - OC_CONFIG::setValue('dbname', $dbusername); - OC_CONFIG::setValue('dbpassword', $dbpassword); + OC_CONFIG::setValue('dbuser', $dbusername); + OC_CONFIG::setValue('dbname', $dbusername); + OC_CONFIG::setValue('dbpassword', $dbpassword); - //create the database not neccessary, oracle implies user = schema - //self::oci_createDatabase($dbname, $dbusername, $connection); - } else { + //create the database not neccessary, oracle implies user = schema + //self::oci_createDatabase($dbname, $dbusername, $connection); + } else { - OC_CONFIG::setValue('dbuser', $dbuser); - OC_CONFIG::setValue('dbname', $dbname); - OC_CONFIG::setValue('dbpassword', $dbpass); + OC_CONFIG::setValue('dbuser', $dbuser); + OC_CONFIG::setValue('dbname', $dbname); + OC_CONFIG::setValue('dbpassword', $dbpass); - //create the database not neccessary, oracle implies user = schema - //self::oci_createDatabase($dbname, $dbuser, $connection); - } + //create the database not neccessary, oracle implies user = schema + //self::oci_createDatabase($dbname, $dbuser, $connection); + } - //FIXME check tablespace exists: select * from user_tablespaces + //FIXME check tablespace exists: select * from user_tablespaces - // the connection to dbname=oracle is not needed anymore - oci_close($connection); + // the connection to dbname=oracle is not needed anymore + oci_close($connection); - // connect to the oracle database (schema=$dbuser) an check if the schema needs to be filled - $dbuser = OC_CONFIG::getValue('dbuser'); - //$dbname = OC_CONFIG::getValue('dbname'); - $dbpass = OC_CONFIG::getValue('dbpassword'); + // connect to the oracle database (schema=$dbuser) an check if the schema needs to be filled + $dbuser = OC_CONFIG::getValue('dbuser'); + //$dbname = OC_CONFIG::getValue('dbname'); + $dbpass = OC_CONFIG::getValue('dbpassword'); - $e_host = addslashes($dbhost); - $e_dbname = addslashes($dbname); + $e_host = addslashes($dbhost); + $e_dbname = addslashes($dbname); - $connection_string = '//'.$e_host.'/'.$e_dbname; - $connection = @oci_connect($dbuser, $dbpass, $connection_string); - if(!$connection) { - $error[] = array( - 'error' => 'Oracle username and/or password not valid', - 'hint' => 'You need to enter either an existing account or the administrator.' - ); - return $error; - } else { - $query = "SELECT count(*) FROM user_tables WHERE table_name = :un"; - $stmt = oci_parse($connection, $query); - $un = $dbtableprefix.'users'; - oci_bind_by_name($stmt, ':un', $un); - if (!$stmt) { - $entry='DB Error: "'.oci_last_error($connection).'"
    '; - $entry.='Offending command was: '.$query.'
    '; - echo($entry); - } - $result = oci_execute($stmt); + $connection_string = '//'.$e_host.'/'.$e_dbname; + $connection = @oci_connect($dbuser, $dbpass, $connection_string); + if(!$connection) { + $error[] = array( + 'error' => 'Oracle username and/or password not valid', + 'hint' => 'You need to enter either an existing account or the administrator.' + ); + return $error; + } else { + $query = "SELECT count(*) FROM user_tables WHERE table_name = :un"; + $stmt = oci_parse($connection, $query); + $un = $dbtableprefix.'users'; + oci_bind_by_name($stmt, ':un', $un); + if (!$stmt) { + $entry='DB Error: "'.oci_last_error($connection).'"
    '; + $entry.='Offending command was: '.$query.'
    '; + echo($entry); + } + $result = oci_execute($stmt); - if($result) { - $row = oci_fetch_row($stmt); - } - if(!$result or $row[0]==0) { - OC_DB::createDbFromStructure('db_structure.xml'); - } - } - } - } + if($result) { + $row = oci_fetch_row($stmt); + } + if(!$result or $row[0]==0) { + OC_DB::createDbFromStructure('db_structure.xml'); + } + } + } + } else { //delete the old sqlite database first, might cause infinte loops otherwise if(file_exists("$datadir/owncloud.db")) { @@ -462,79 +462,79 @@ class OC_Setup { } } } - /** - * - * @param String $name - * @param String $password - * @param String $tablespace - * @param resource $connection - */ - private static function oci_createDBUser($name, $password, $tablespace, $connection) { + /** + * + * @param String $name + * @param String $password + * @param String $tablespace + * @param resource $connection + */ + private static function oci_createDBUser($name, $password, $tablespace, $connection) { - $query = "SELECT * FROM all_users WHERE USERNAME = :un"; - $stmt = oci_parse($connection, $query); - if (!$stmt) { - $entry='DB Error: "'.oci_error($connection).'"
    '; - $entry.='Offending command was: '.$query.'
    '; - echo($entry); - } - oci_bind_by_name($stmt, ':un', $name); - $result = oci_execute($stmt); - if(!$result) { - $entry='DB Error: "'.oci_error($connection).'"
    '; - $entry.='Offending command was: '.$query.'
    '; - echo($entry); - } + $query = "SELECT * FROM all_users WHERE USERNAME = :un"; + $stmt = oci_parse($connection, $query); + if (!$stmt) { + $entry='DB Error: "'.oci_error($connection).'"
    '; + $entry.='Offending command was: '.$query.'
    '; + echo($entry); + } + oci_bind_by_name($stmt, ':un', $name); + $result = oci_execute($stmt); + if(!$result) { + $entry='DB Error: "'.oci_error($connection).'"
    '; + $entry.='Offending command was: '.$query.'
    '; + echo($entry); + } - if(! oci_fetch_row($stmt)) { - //user does not exists let's create it :) - //password must start with alphabetic character in oracle - $query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$tablespace; //TODO set default tablespace - $stmt = oci_parse($connection, $query); - if (!$stmt) { - $entry='DB Error: "'.oci_error($connection).'"
    '; - $entry.='Offending command was: '.$query.'
    '; - echo($entry); - } - //oci_bind_by_name($stmt, ':un', $name); - $result = oci_execute($stmt); - if(!$result) { - $entry='DB Error: "'.oci_error($connection).'"
    '; - $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'
    '; - echo($entry); - } - } else { // change password of the existing role - $query = "ALTER USER :un IDENTIFIED BY :pw"; - $stmt = oci_parse($connection, $query); - if (!$stmt) { - $entry='DB Error: "'.oci_error($connection).'"
    '; - $entry.='Offending command was: '.$query.'
    '; - echo($entry); - } - oci_bind_by_name($stmt, ':un', $name); - oci_bind_by_name($stmt, ':pw', $password); - $result = oci_execute($stmt); - if(!$result) { - $entry='DB Error: "'.oci_error($connection).'"
    '; - $entry.='Offending command was: '.$query.'
    '; - echo($entry); - } - } - // grant neccessary roles - $query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name; - $stmt = oci_parse($connection, $query); - if (!$stmt) { - $entry='DB Error: "'.oci_error($connection).'"
    '; - $entry.='Offending command was: '.$query.'
    '; - echo($entry); - } - $result = oci_execute($stmt); - if(!$result) { - $entry='DB Error: "'.oci_error($connection).'"
    '; - $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'
    '; - echo($entry); - } - } + if(! oci_fetch_row($stmt)) { + //user does not exists let's create it :) + //password must start with alphabetic character in oracle + $query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$tablespace; //TODO set default tablespace + $stmt = oci_parse($connection, $query); + if (!$stmt) { + $entry='DB Error: "'.oci_error($connection).'"
    '; + $entry.='Offending command was: '.$query.'
    '; + echo($entry); + } + //oci_bind_by_name($stmt, ':un', $name); + $result = oci_execute($stmt); + if(!$result) { + $entry='DB Error: "'.oci_error($connection).'"
    '; + $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'
    '; + echo($entry); + } + } else { // change password of the existing role + $query = "ALTER USER :un IDENTIFIED BY :pw"; + $stmt = oci_parse($connection, $query); + if (!$stmt) { + $entry='DB Error: "'.oci_error($connection).'"
    '; + $entry.='Offending command was: '.$query.'
    '; + echo($entry); + } + oci_bind_by_name($stmt, ':un', $name); + oci_bind_by_name($stmt, ':pw', $password); + $result = oci_execute($stmt); + if(!$result) { + $entry='DB Error: "'.oci_error($connection).'"
    '; + $entry.='Offending command was: '.$query.'
    '; + echo($entry); + } + } + // grant neccessary roles + $query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name; + $stmt = oci_parse($connection, $query); + if (!$stmt) { + $entry='DB Error: "'.oci_error($connection).'"
    '; + $entry.='Offending command was: '.$query.'
    '; + echo($entry); + } + $result = oci_execute($stmt); + if(!$result) { + $entry='DB Error: "'.oci_error($connection).'"
    '; + $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'
    '; + echo($entry); + } + } /** * create .htaccess files for apache hosts From 463b48b2e1e337c1531f094b26cae79d11bdcf27 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 10 Sep 2012 14:40:54 +0200 Subject: [PATCH 042/205] fix file upload --- lib/filesystemview.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/filesystemview.php b/lib/filesystemview.php index 743f940301..3a17af510c 100644 --- a/lib/filesystemview.php +++ b/lib/filesystemview.php @@ -295,12 +295,12 @@ class OC_FilesystemView { OC_Filesystem::signal_post_create, array( OC_Filesystem::signal_param_path => $path) ); - } + }/* OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, array( OC_Filesystem::signal_param_path => $path) - ); + );*/ OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count); return $count > 0; }else{ From 6a29bbda7ad87c8bd606c606d237f4c9a0cca9eb Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 11 Sep 2012 02:03:53 +0200 Subject: [PATCH 043/205] [tx-robot] updated from transifex --- apps/files/l10n/ca.php | 2 + apps/files/l10n/de.php | 2 + apps/files/l10n/vi.php | 23 +++++++++- apps/files_external/l10n/uk.php | 5 ++ apps/files_sharing/l10n/uk.php | 4 ++ apps/user_ldap/l10n/uk.php | 4 ++ apps/user_ldap/l10n/vi.php | 13 ++++++ core/l10n/uk.php | 17 +++++++ l10n/ca/files.po | 10 ++-- l10n/de/files.po | 9 ++-- l10n/fr/settings.po | 9 ++-- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/uk/core.po | 71 +++++++++++++++-------------- l10n/uk/files_external.po | 15 +++--- l10n/uk/files_sharing.po | 15 +++--- l10n/uk/lib.po | 43 ++++++++--------- l10n/uk/user_ldap.po | 13 +++--- l10n/vi/files.po | 48 +++++++++---------- l10n/vi/user_ldap.po | 31 +++++++------ lib/l10n/uk.php | 3 +- settings/l10n/fr.php | 2 +- 29 files changed, 217 insertions(+), 140 deletions(-) create mode 100644 apps/files_external/l10n/uk.php create mode 100644 apps/files_sharing/l10n/uk.php create mode 100644 apps/user_ldap/l10n/uk.php create mode 100644 apps/user_ldap/l10n/vi.php diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php index 336f59ae86..26c6ad4de6 100644 --- a/apps/files/l10n/ca.php +++ b/apps/files/l10n/ca.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "S'ha perdut un fitxer temporal", "Failed to write to disk" => "Ha fallat en escriure al disc", "Files" => "Fitxers", +"Unshare" => "Deixa de compartir", "Delete" => "Suprimeix", "already exists" => "ja existeix", "replace" => "substitueix", @@ -15,6 +16,7 @@ "replaced" => "substituït", "undo" => "desfés", "with" => "per", +"unshared" => "No compartits", "deleted" => "esborrat", "generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.", "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes", diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php index 3db6af8477..324fae16f0 100644 --- a/apps/files/l10n/de.php +++ b/apps/files/l10n/de.php @@ -7,6 +7,7 @@ "Missing a temporary folder" => "Temporärer Ordner fehlt.", "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte", "Files" => "Dateien", +"Unshare" => "Nicht mehr teilen", "Delete" => "Löschen", "already exists" => "ist bereits vorhanden", "replace" => "ersetzen", @@ -15,6 +16,7 @@ "replaced" => "ersetzt", "undo" => "rückgängig machen", "with" => "mit", +"unshared" => "Nicht mehr teilen", "deleted" => "gelöscht", "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.", "Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie ein Verzeichnis ist oder 0 Bytes hat.", diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php index 876d5abe9a..ce7e0c219a 100644 --- a/apps/files/l10n/vi.php +++ b/apps/files/l10n/vi.php @@ -1,10 +1,28 @@ "Không có lỗi, các tập tin đã được tải lên thành công", +"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Những tập tin được tải lên vượt quá upload_max_filesize được chỉ định trong php.ini", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định", +"The uploaded file was only partially uploaded" => "Tập tin tải lên mới chỉ tải lên được một phần", +"No file was uploaded" => "Không có tập tin nào được tải lên", +"Missing a temporary folder" => "Không tìm thấy thư mục tạm", +"Failed to write to disk" => "Không thể ghi vào đĩa cứng", "Files" => "Tập tin", +"Unshare" => "Không chia sẽ", "Delete" => "Xóa", +"already exists" => "đã tồn tại", +"replace" => "thay thế", +"suggest name" => "tên gợi ý", +"cancel" => "hủy", +"replaced" => "đã được thay thế", +"undo" => "lùi lại", +"with" => "với", +"deleted" => "đã xóa", +"generating ZIP-file, it may take some time." => "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian", +"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte", "Upload Error" => "Tải lên lỗi", "Pending" => "Chờ", "Upload cancelled." => "Hủy tải lên", +"File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.", "Invalid name, '/' is not allowed." => "Tên không hợp lệ ,không được phép dùng '/'", "Size" => "Kích cỡ", "Modified" => "Thay đổi", @@ -14,9 +32,11 @@ "files" => "files", "File handling" => "Xử lý tập tin", "Maximum upload size" => "Kích thước tối đa ", +"Needed for multi-file and folder downloads." => "Cần thiết cho tải nhiều tập tin và thư mục.", "Enable ZIP-download" => "Cho phép ZIP-download", "0 is unlimited" => "0 là không giới hạn", "Maximum input size for ZIP files" => "Kích thước tối đa cho các tập tin ZIP", +"Save" => "Lưu", "New" => "Mới", "Text file" => "Tập tin văn bản", "Folder" => "Folder", @@ -29,5 +49,6 @@ "Download" => "Tải xuống", "Upload too large" => "File tải lên quá lớn", "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang cố gắng tải lên vượt quá kích thước tối đa cho phép trên máy chủ này.", -"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ." +"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.", +"Current scanning" => "Hiện tại đang quét" ); diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php new file mode 100644 index 0000000000..79920b9014 --- /dev/null +++ b/apps/files_external/l10n/uk.php @@ -0,0 +1,5 @@ + "Групи", +"Users" => "Користувачі", +"Delete" => "Видалити" +); diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php new file mode 100644 index 0000000000..43b86a28c1 --- /dev/null +++ b/apps/files_sharing/l10n/uk.php @@ -0,0 +1,4 @@ + "Пароль", +"Download" => "Завантажити" +); diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php new file mode 100644 index 0000000000..fd6a88d237 --- /dev/null +++ b/apps/user_ldap/l10n/uk.php @@ -0,0 +1,4 @@ + "Пароль", +"Help" => "Допомога" +); diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php new file mode 100644 index 0000000000..7a6ac2665c --- /dev/null +++ b/apps/user_ldap/l10n/vi.php @@ -0,0 +1,13 @@ + "Máy chủ", +"Password" => "Mật khẩu", +"Port" => "Cổng", +"Use TLS" => "Sử dụng TLS", +"Turn off SSL certificate validation." => "Tắt xác thực chứng nhận SSL", +"Not recommended, use for testing only." => "Không khuyến khích, Chỉ sử dụng để thử nghiệm.", +"User Display Name Field" => "Hiển thị tên người sử dụng", +"Group Display Name Field" => "Hiển thị tên nhóm", +"in bytes" => "Theo Byte", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD", +"Help" => "Giúp đỡ" +); diff --git a/core/l10n/uk.php b/core/l10n/uk.php index 4a10a9fc74..e84ec8f883 100644 --- a/core/l10n/uk.php +++ b/core/l10n/uk.php @@ -1,5 +1,21 @@ "Налаштування", +"January" => "Січень", +"February" => "Лютий", +"March" => "Березень", +"April" => "Квітень", +"May" => "Травень", +"June" => "Червень", +"July" => "Липень", +"August" => "Серпень", +"September" => "Вересень", +"October" => "Жовтень", +"November" => "Листопад", +"December" => "Грудень", +"Cancel" => "Відмінити", +"No" => "Ні", +"Yes" => "Так", +"Error" => "Помилка", "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на e-mail.", "Username" => "Ім'я користувача", "Your password was reset" => "Ваш пароль був скинутий", @@ -10,6 +26,7 @@ "Users" => "Користувачі", "Admin" => "Адміністратор", "Help" => "Допомога", +"Add" => "Додати", "Password" => "Пароль", "Configure the database" => "Налаштування бази даних", "will be used" => "буде використано", diff --git a/l10n/ca/files.po b/l10n/ca/files.po index f43fdccfb5..09799489c8 100644 --- a/l10n/ca/files.po +++ b/l10n/ca/files.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-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" +"PO-Revision-Date: 2012-09-10 07:25+0000\n" +"Last-Translator: rogerc \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -56,7 +56,7 @@ msgstr "Fitxers" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Deixa de compartir" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -92,7 +92,7 @@ msgstr "per" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "No compartits" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/de/files.po b/l10n/de/files.po index 571a069b9c..406a0d2506 100644 --- a/l10n/de/files.po +++ b/l10n/de/files.po @@ -4,6 +4,7 @@ # # Translators: # , 2012. +# I Robot , 2012. # Jan-Christoph Borchardt , 2011. # Jan-Christoph Borchardt , 2011. # Marcel Kühlhorn , 2012. @@ -18,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" +"PO-Revision-Date: 2012-09-10 13:09+0000\n" "Last-Translator: I Robot \n" "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n" "MIME-Version: 1.0\n" @@ -64,7 +65,7 @@ msgstr "Dateien" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Nicht mehr teilen" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -100,7 +101,7 @@ msgstr "mit" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "Nicht mehr teilen" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po index bdf3e67d24..ae731ca30b 100644 --- a/l10n/fr/settings.po +++ b/l10n/fr/settings.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Brice , 2012. # Cyril Glapa , 2012. # , 2011. # , 2012. @@ -18,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:02+0200\n" -"PO-Revision-Date: 2012-09-05 13:18+0000\n" -"Last-Translator: Romain DEP. \n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" +"PO-Revision-Date: 2012-09-10 20:41+0000\n" +"Last-Translator: Brice \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -200,7 +201,7 @@ msgstr "Voir la page des applications à l'url apps.owncloud.com" #: templates/apps.php:30 msgid "-licensed by " -msgstr "-sous licence, par " +msgstr "Distribué sous licence , par " #: templates/help.php:9 msgid "Documentation" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index 932761bdcb..d9f9f4de0e 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-10 02:02+0200\n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index bd2aaf3f74..bfc75b5455 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-10 02:02+0200\n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 357ef03faf..0f964a37ff 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-10 02:02+0200\n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 37669ac70f..98d019bb92 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-10 02:02+0200\n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index 0b0636f1de..b10575b0c7 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-10 02:02+0200\n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 7bc8ac862b..0368a7d338 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-10 02:02+0200\n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index 3fa354b572..d30053736d 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-10 02:02+0200\n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 01583d6a5b..93f7e40d44 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-10 02:02+0200\n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 5df0ca0963..89ab2c5695 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-10 02:02+0200\n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/uk/core.po b/l10n/uk/core.po index 532bd0a547..a544613a18 100644 --- a/l10n/uk/core.po +++ b/l10n/uk/core.po @@ -5,13 +5,14 @@ # Translators: # , 2012. # Soul Kim , 2012. +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-06 02:02+0200\n" -"PO-Revision-Date: 2012-09-06 00:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" +"PO-Revision-Date: 2012-09-10 11:16+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,69 +32,69 @@ msgstr "" msgid "This category already exists: " msgstr "" -#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61 +#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55 msgid "Settings" msgstr "Налаштування" -#: js/js.js:593 +#: js/js.js:642 msgid "January" -msgstr "" +msgstr "Січень" -#: js/js.js:593 +#: js/js.js:642 msgid "February" -msgstr "" +msgstr "Лютий" -#: js/js.js:593 +#: js/js.js:642 msgid "March" -msgstr "" +msgstr "Березень" -#: js/js.js:593 +#: js/js.js:642 msgid "April" -msgstr "" +msgstr "Квітень" -#: js/js.js:593 +#: js/js.js:642 msgid "May" -msgstr "" +msgstr "Травень" -#: js/js.js:593 +#: js/js.js:642 msgid "June" -msgstr "" +msgstr "Червень" -#: js/js.js:594 +#: js/js.js:643 msgid "July" -msgstr "" +msgstr "Липень" -#: js/js.js:594 +#: js/js.js:643 msgid "August" -msgstr "" +msgstr "Серпень" -#: js/js.js:594 +#: js/js.js:643 msgid "September" -msgstr "" +msgstr "Вересень" -#: js/js.js:594 +#: js/js.js:643 msgid "October" -msgstr "" +msgstr "Жовтень" -#: js/js.js:594 +#: js/js.js:643 msgid "November" -msgstr "" +msgstr "Листопад" -#: js/js.js:594 +#: js/js.js:643 msgid "December" -msgstr "" +msgstr "Грудень" #: js/oc-dialogs.js:143 js/oc-dialogs.js:163 msgid "Cancel" -msgstr "" +msgstr "Відмінити" #: js/oc-dialogs.js:159 msgid "No" -msgstr "" +msgstr "Ні" #: js/oc-dialogs.js:160 msgid "Yes" -msgstr "" +msgstr "Так" #: js/oc-dialogs.js:177 msgid "Ok" @@ -105,7 +106,7 @@ msgstr "" #: js/oc-vcategories.js:68 msgid "Error" -msgstr "" +msgstr "Помилка" #: lostpassword/index.php:26 msgid "ownCloud password reset" @@ -186,7 +187,7 @@ msgstr "" #: templates/edit_categories_dialog.php:14 msgid "Add" -msgstr "" +msgstr "Додати" #: templates/installation.php:24 msgid "Create an admin account" @@ -237,11 +238,11 @@ msgstr "" msgid "Finish setup" msgstr "Завершити налаштування" -#: templates/layout.guest.php:42 +#: templates/layout.guest.php:36 msgid "web services under your control" msgstr "веб-сервіс під вашим контролем" -#: templates/layout.user.php:45 +#: templates/layout.user.php:39 msgid "Log out" msgstr "Вихід" diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po index 4d2de48c58..c40b94e138 100644 --- a/l10n/uk/files_external.po +++ b/l10n/uk/files_external.po @@ -3,19 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-08-13 23:12+0200\n" -"PO-Revision-Date: 2012-08-12 22:34+0000\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" +"PO-Revision-Date: 2012-09-10 10:46+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\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" @@ -55,15 +56,15 @@ 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" diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po index cfebfcf491..411329b93c 100644 --- a/l10n/uk/files_sharing.po +++ b/l10n/uk/files_sharing.po @@ -3,23 +3,24 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 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:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" +"PO-Revision-Date: 2012-09-10 10:38+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\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" @@ -27,12 +28,12 @@ msgstr "" #: templates/public.php:9 templates/public.php:19 msgid "Download" -msgstr "" +msgstr "Завантажити" #: templates/public.php:18 msgid "No preview available for" msgstr "" -#: templates/public.php:23 +#: templates/public.php:25 msgid "web services under your control" msgstr "" diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po index d2a2e0eac4..4458c03b3f 100644 --- a/l10n/uk/lib.po +++ b/l10n/uk/lib.po @@ -4,41 +4,42 @@ # # Translators: # , 2012. +# , 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 \n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" +"PO-Revision-Date: 2012-09-10 11:28+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\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 "Допомога" -#: 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 "Адмін" @@ -70,45 +71,45 @@ msgstr "Помилка автентифікації" msgid "Token expired. Please reload page." 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 "роки тому" @@ -123,4 +124,4 @@ msgstr "" #: updater.php:71 msgid "updates check is disabled" -msgstr "" +msgstr "перевірка оновлень відключена" diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po index d948126316..d82593c3df 100644 --- a/l10n/uk/user_ldap.po +++ b/l10n/uk/user_ldap.po @@ -3,19 +3,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 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 \n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" +"PO-Revision-Date: 2012-09-10 11:08+0000\n" +"Last-Translator: VicDeo \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: uk\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" @@ -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." @@ -167,4 +168,4 @@ msgstr "" #: templates/settings.php:32 msgid "Help" -msgstr "" +msgstr "Допомога" diff --git a/l10n/vi/files.po b/l10n/vi/files.po index e6cb256217..451fc69587 100644 --- a/l10n/vi/files.po +++ b/l10n/vi/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-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" +"PO-Revision-Date: 2012-09-10 09:22+0000\n" +"Last-Translator: mattheu_9x \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,29 +25,29 @@ msgstr "Không có lỗi, các tập tin đã được tải lên thành công" #: ajax/upload.php:21 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini" -msgstr "" +msgstr "Những tập tin được tải lên vượt quá upload_max_filesize được chỉ định trong php.ini" #: ajax/upload.php:22 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form" -msgstr "" +msgstr "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định" #: ajax/upload.php:23 msgid "The uploaded file was only partially uploaded" -msgstr "" +msgstr "Tập tin tải lên mới chỉ tải lên được một phần" #: ajax/upload.php:24 msgid "No file was uploaded" -msgstr "" +msgstr "Không có tập tin nào được tải lên" #: ajax/upload.php:25 msgid "Missing a temporary folder" -msgstr "" +msgstr "Không tìm thấy thư mục tạm" #: ajax/upload.php:26 msgid "Failed to write to disk" -msgstr "" +msgstr "Không thể ghi vào đĩa cứng" #: appinfo/app.php:6 msgid "Files" @@ -55,7 +55,7 @@ msgstr "Tập tin" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Không chia sẽ" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -63,31 +63,31 @@ msgstr "Xóa" #: js/filelist.js:186 js/filelist.js:188 msgid "already exists" -msgstr "" +msgstr "đã tồn tại" #: js/filelist.js:186 js/filelist.js:188 msgid "replace" -msgstr "" +msgstr "thay thế" #: js/filelist.js:186 msgid "suggest name" -msgstr "" +msgstr "tên gợi ý" #: js/filelist.js:186 js/filelist.js:188 msgid "cancel" -msgstr "" +msgstr "hủy" #: js/filelist.js:235 js/filelist.js:237 msgid "replaced" -msgstr "" +msgstr "đã được thay thế" #: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270 msgid "undo" -msgstr "" +msgstr "lùi lại" #: js/filelist.js:237 msgid "with" -msgstr "" +msgstr "với" #: js/filelist.js:268 msgid "unshared" @@ -95,15 +95,15 @@ msgstr "" #: js/filelist.js:270 msgid "deleted" -msgstr "" +msgstr "đã xóa" #: js/files.js:179 msgid "generating ZIP-file, it may take some time." -msgstr "" +msgstr "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian" #: js/files.js:208 msgid "Unable to upload your file as it is a directory or has 0 bytes" -msgstr "" +msgstr "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte" #: js/files.js:208 msgid "Upload Error" @@ -120,7 +120,7 @@ msgstr "Hủy tải lên" #: js/files.js:423 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." -msgstr "" +msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này." #: js/files.js:493 msgid "Invalid name, '/' is not allowed." @@ -164,7 +164,7 @@ msgstr "" #: templates/admin.php:9 msgid "Needed for multi-file and folder downloads." -msgstr "" +msgstr "Cần thiết cho tải nhiều tập tin và thư mục." #: templates/admin.php:9 msgid "Enable ZIP-download" @@ -180,7 +180,7 @@ msgstr "Kích thước tối đa cho các tập tin ZIP" #: templates/admin.php:14 msgid "Save" -msgstr "" +msgstr "Lưu" #: templates/index.php:7 msgid "New" @@ -238,4 +238,4 @@ msgstr "Tập tin đang được quét ,vui lòng chờ." #: templates/index.php:85 msgid "Current scanning" -msgstr "" +msgstr "Hiện tại đang quét" diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po index 6fd933c5b5..111219c720 100644 --- a/l10n/vi/user_ldap.po +++ b/l10n/vi/user_ldap.po @@ -3,23 +3,24 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 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 \n" +"POT-Creation-Date: 2012-09-11 02:02+0200\n" +"PO-Revision-Date: 2012-09-10 08:50+0000\n" +"Last-Translator: mattheu_9x \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: vi\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: templates/settings.php:8 msgid "Host" -msgstr "" +msgstr "Máy chủ" #: templates/settings.php:8 msgid "" @@ -47,7 +48,7 @@ msgstr "" #: templates/settings.php:11 msgid "Password" -msgstr "" +msgstr "Mật khẩu" #: 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 "Cổng" #: templates/settings.php:18 msgid "Base User Tree" @@ -111,7 +112,7 @@ msgstr "" #: templates/settings.php:21 msgid "Use TLS" -msgstr "" +msgstr "Sử dụng TLS" #: templates/settings.php:21 msgid "Do not use it for SSL connections, it will fail." @@ -123,7 +124,7 @@ msgstr "" #: templates/settings.php:23 msgid "Turn off SSL certificate validation." -msgstr "" +msgstr "Tắt xác thực chứng nhận SSL" #: templates/settings.php:23 msgid "" @@ -133,11 +134,11 @@ msgstr "" #: templates/settings.php:23 msgid "Not recommended, use for testing only." -msgstr "" +msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm." #: templates/settings.php:24 msgid "User Display Name Field" -msgstr "" +msgstr "Hiển thị tên người sử dụng" #: templates/settings.php:24 msgid "The LDAP attribute to use to generate the user`s ownCloud name." @@ -145,7 +146,7 @@ msgstr "" #: templates/settings.php:25 msgid "Group Display Name Field" -msgstr "" +msgstr "Hiển thị tên nhóm" #: templates/settings.php:25 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." @@ -153,7 +154,7 @@ msgstr "" #: templates/settings.php:27 msgid "in bytes" -msgstr "" +msgstr "Theo Byte" #: 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 "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD" #: templates/settings.php:32 msgid "Help" -msgstr "" +msgstr "Giúp đỡ" diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php index 18f6a4a623..423aa12b2d 100644 --- a/lib/l10n/uk.php +++ b/lib/l10n/uk.php @@ -20,5 +20,6 @@ "last month" => "минулого місяця", "months ago" => "місяці тому", "last year" => "минулого року", -"years ago" => "роки тому" +"years ago" => "роки тому", +"updates check is disabled" => "перевірка оновлень відключена" ); diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php index 7baa923bfc..906e80eabb 100644 --- a/settings/l10n/fr.php +++ b/settings/l10n/fr.php @@ -38,7 +38,7 @@ "Add your App" => "Ajoutez votre application", "Select an App" => "Sélectionner une Application", "See application page at apps.owncloud.com" => "Voir la page des applications à l'url apps.owncloud.com", -"-licensed by " => "-sous licence, par ", +"-licensed by " => "Distribué sous licence , par ", "Documentation" => "Documentation", "Managing Big Files" => "Gérer les gros fichiers", "Ask a question" => "Poser une question", From ff6141b1e9fa265557ddae11963a577a5a4eb240 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Mon, 10 Sep 2012 21:57:05 -0400 Subject: [PATCH 044/205] Change version number update occurs on to prevent problem with betas, users using the 4.5 betas will have to manually trigger the update if they want to get their old shared files back again --- apps/files_sharing/appinfo/update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php index cb6af2d5f0..eabd1167c9 100644 --- a/apps/files_sharing/appinfo/update.php +++ b/apps/files_sharing/appinfo/update.php @@ -1,6 +1,6 @@ execute(); $groupShares = array(); From 37f0b85d3f0517a1548a0e62d1d1aa1b04e0c79c Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Tue, 11 Sep 2012 00:37:31 -0400 Subject: [PATCH 045/205] Fix problem with non share collection item types being treated as collections --- lib/public/share.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/public/share.php b/lib/public/share.php index 6186c2d1c1..ccb5a56ac7 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -458,8 +458,11 @@ class Share { $collectionTypes[] = $type; } } + if (!self::getBackend($itemType) instanceof Share_Backend_Collection) { + unset($collectionTypes[0]); + } // Return array if collections were found or the item type is a collection itself - collections can be inside collections - if (count($collectionTypes) > 1 || self::getBackend($itemType) instanceof Share_Backend_Collection) { + if (count($collectionTypes) > 0) { return $collectionTypes; } return false; @@ -504,9 +507,14 @@ class Share { $root = ''; if ($includeCollections && !isset($item) && ($collectionTypes = self::getCollectionItemTypes($itemType))) { // If includeCollections is true, find collections of this item type, e.g. a music album contains songs - $placeholders = join(',', array_fill(0, count($collectionTypes), '?')); - $where .= ' OR item_type IN ('.$placeholders.'))'; - $queryArgs = $collectionTypes; + if (!in_array($itemType, $collectionTypes)) { + $itemTypes = array_merge(array($itemType), $collectionTypes); + } else { + $itemTypes = $collectionTypes; + } + $placeholders = join(',', array_fill(0, count($itemTypes), '?')); + $where .= ' WHERE item_type IN ('.$placeholders.'))'; + $queryArgs = $itemTypes; } else { $where = ' WHERE `item_type` = ?'; $queryArgs = array($itemType); @@ -580,7 +588,7 @@ class Share { } } $queryArgs[] = $item; - if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) { + if ($includeCollections && $collectionTypes) { $placeholders = join(',', array_fill(0, count($collectionTypes), '?')); $where .= ' OR item_type IN ('.$placeholders.'))'; $queryArgs = array_merge($queryArgs, $collectionTypes); @@ -689,7 +697,7 @@ class Share { } } // Check if this is a collection of the requested item type - if ($includeCollections && in_array($row['item_type'], $collectionTypes)) { + if ($includeCollections && $collectionTypes && in_array($row['item_type'], $collectionTypes)) { if (($collectionBackend = self::getBackend($row['item_type'])) && $collectionBackend instanceof Share_Backend_Collection) { // Collections can be inside collections, check if the item is a collection if (isset($item) && $row['item_type'] == $itemType && $row[$column] == $item) { From bf2d1e78f23e736f3306d4625b09b1beac9f6db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 11 Sep 2012 13:16:34 +0200 Subject: [PATCH 046/205] don't set values with oc_appconfig when oc is not installed yet, allows to render guest page for installation again --- lib/templatelayout.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/templatelayout.php b/lib/templatelayout.php index d72f5552fd..c898628bcd 100644 --- a/lib/templatelayout.php +++ b/lib/templatelayout.php @@ -41,7 +41,7 @@ class OC_TemplateLayout extends OC_Template { } $this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)),false ); // Ugly unescape slashes waiting for better solution - if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) { + if (OC_Config::getValue('installed', false) && !OC_AppConfig::getValue('core', 'remote_core.css', false)) { OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php'); OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php'); } From b6a106a920654efe8e73139dc2aec3a72f5215a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Tue, 11 Sep 2012 18:12:38 +0200 Subject: [PATCH 047/205] allow using only dbname for oracle --- lib/setup.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/lib/setup.php b/lib/setup.php index 67346799fe..c21c8be395 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -63,7 +63,7 @@ class OC_Setup { if(empty($options['dbname'])) { $error[] = "$dbprettyname enter the database name."; } - if(empty($options['dbhost'])) { + if($dbtype != 'oci' && empty($options['dbhost'])) { $error[] = "$dbprettyname set the database host."; } } @@ -237,7 +237,7 @@ class OC_Setup { $dbpass = $options['dbpass']; $dbname = $options['dbname']; $dbtablespace = $options['dbtablespace']; - $dbhost = $options['dbhost']; + $dbhost = isset($options['dbhost'])?$options['dbhost']:''; $dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_'; OC_CONFIG::setValue('dbname', $dbname); OC_CONFIG::setValue('dbtablespace', $dbtablespace); @@ -247,8 +247,12 @@ class OC_Setup { $e_host = addslashes($dbhost); $e_dbname = addslashes($dbname); //check if the database user has admin right - $connection_string = '//'.$e_host.'/'.$e_dbname; - $connection = @oci_connect($dbuser, $dbpass, $connection_string); + if ($e_host == '') { + $easy_connect_string = $e_dbname; // use dbname as easy connect name + } else { + $easy_connect_string = '//'.$e_host.'/'.$e_dbname; + } + $connection = @oci_connect($dbuser, $dbpass, $easy_connect_string); if(!$connection) { $e = oci_error(); $error[] = array( @@ -314,8 +318,12 @@ class OC_Setup { $e_host = addslashes($dbhost); $e_dbname = addslashes($dbname); - $connection_string = '//'.$e_host.'/'.$e_dbname; - $connection = @oci_connect($dbuser, $dbpass, $connection_string); + if ($e_host == '') { + $easy_connect_string = $e_dbname; // use dbname as easy connect name + } else { + $easy_connect_string = '//'.$e_host.'/'.$e_dbname; + } + $connection = @oci_connect($dbuser, $dbpass, $easy_connect_string); if(!$connection) { $error[] = array( 'error' => 'Oracle username and/or password not valid', From 5c1a79210f5db0a4942c6628350954d70e7a39ea Mon Sep 17 00:00:00 2001 From: Thomas Mueller Date: Tue, 11 Sep 2012 23:51:12 +0200 Subject: [PATCH 048/205] added hint to restart the web server in case recetly installed php modules are still not available --- lib/util.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/util.php b/lib/util.php index 5046550d6a..f69dacaa22 100755 --- a/lib/util.php +++ b/lib/util.php @@ -200,9 +200,11 @@ class OC_Util { public static function checkServer() { $errors=array(); + $web_server_restart= false; //check for database drivers if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')) { $errors[]=array('error'=>'No database drivers (sqlite, mysql, or postgresql) installed.
    ','hint'=>'');//TODO: sane hint + $web_server_restart= true; } //common hint for all file permissons error messages @@ -262,28 +264,40 @@ class OC_Util { // check if all required php modules are present if(!class_exists('ZipArchive')) { $errors[]=array('error'=>'PHP module zip not installed.
    ','hint'=>'Please ask your server administrator to install the module.'); + $web_server_restart= false; } if(!function_exists('mb_detect_encoding')) { $errors[]=array('error'=>'PHP module mb multibyte not installed.
    ','hint'=>'Please ask your server administrator to install the module.'); + $web_server_restart= false; } if(!function_exists('ctype_digit')) { $errors[]=array('error'=>'PHP module ctype is not installed.
    ','hint'=>'Please ask your server administrator to install the module.'); + $web_server_restart= false; } if(!function_exists('json_encode')) { $errors[]=array('error'=>'PHP module JSON is not installed.
    ','hint'=>'Please ask your server administrator to install the module.'); + $web_server_restart= false; } if(!function_exists('imagepng')) { $errors[]=array('error'=>'PHP module GD is not installed.
    ','hint'=>'Please ask your server administrator to install the module.'); + $web_server_restart= false; } if(!function_exists('gzencode')) { $errors[]=array('error'=>'PHP module zlib is not installed.
    ','hint'=>'Please ask your server administrator to install the module.'); + $web_server_restart= false; } if(floatval(phpversion())<5.3) { $errors[]=array('error'=>'PHP 5.3 is required.
    ','hint'=>'Please ask your server administrator to update PHP to version 5.3 or higher. PHP 5.2 is no longer supported by ownCloud and the PHP community.'); + $web_server_restart= false; } if(!defined('PDO::ATTR_DRIVER_NAME')) { $errors[]=array('error'=>'PHP PDO module is not installed.
    ','hint'=>'Please ask your server administrator to install the module.'); + $web_server_restart= false; + } + + if($web_server_restart) { + $errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?
    ','hint'=>'Please ask your server administrator to restart the web server.'); } return $errors; From 8c9c095d485f0b2e27d7e5636167169bb3aefca1 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 12 Sep 2012 02:02:58 +0200 Subject: [PATCH 049/205] [tx-robot] updated from transifex --- apps/files/l10n/et_EE.php | 5 +++ apps/files/l10n/fr.php | 1 + apps/files_sharing/l10n/zh_TW.php | 6 ++++ apps/files_versions/l10n/et_EE.php | 2 ++ apps/user_ldap/l10n/et_EE.php | 22 ++++++++++++ l10n/et_EE/files.po | 18 +++++----- l10n/et_EE/files_versions.po | 12 +++---- l10n/et_EE/lib.po | 46 ++++++++++++------------- l10n/et_EE/settings.po | 40 +++++++++++----------- l10n/et_EE/user_ldap.po | 52 ++++++++++++++--------------- l10n/fr/files.po | 8 ++--- l10n/ru/settings.po | 26 +++++++-------- l10n/templates/core.pot | 2 +- l10n/templates/files.pot | 2 +- l10n/templates/files_encryption.pot | 2 +- l10n/templates/files_external.pot | 2 +- l10n/templates/files_sharing.pot | 2 +- l10n/templates/files_versions.pot | 2 +- l10n/templates/lib.pot | 2 +- l10n/templates/settings.pot | 2 +- l10n/templates/user_ldap.pot | 2 +- l10n/zh_TW/files_sharing.po | 19 ++++++----- l10n/zh_TW/settings.po | 39 +++++++++++----------- lib/l10n/et_EE.php | 5 ++- settings/l10n/et_EE.php | 16 +++++++++ settings/l10n/ru.php | 22 ++++++------ settings/l10n/zh_TW.php | 16 +++++++++ 27 files changed, 223 insertions(+), 150 deletions(-) create mode 100644 apps/files_sharing/l10n/zh_TW.php diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php index 0763745788..88e9171928 100644 --- a/apps/files/l10n/et_EE.php +++ b/apps/files/l10n/et_EE.php @@ -7,19 +7,23 @@ "Missing a temporary folder" => "Ajutiste failide kaust puudub", "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus", "Files" => "Failid", +"Unshare" => "Lõpeta jagamine", "Delete" => "Kustuta", "already exists" => "on juba olemas", "replace" => "asenda", +"suggest name" => "soovita nime", "cancel" => "loobu", "replaced" => "asendatud", "undo" => "tagasi", "with" => "millega", +"unshared" => "jagamata", "deleted" => "kustutatud", "generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.", "Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti", "Upload Error" => "Üleslaadimise viga", "Pending" => "Ootel", "Upload cancelled." => "Üleslaadimine tühistati.", +"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.", "Invalid name, '/' is not allowed." => "Vigane nimi, '/' pole lubatud.", "Size" => "Suurus", "Modified" => "Muudetud", @@ -34,6 +38,7 @@ "Enable ZIP-download" => "Luba ZIP-ina allalaadimine", "0 is unlimited" => "0 tähendab piiramatut", "Maximum input size for ZIP files" => "Maksimaalne ZIP-faili sisestatava faili suurus", +"Save" => "Salvesta", "New" => "Uus", "Text file" => "Tekstifail", "Folder" => "Kaust", diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php index bce17be3b5..929a2ffd4a 100644 --- a/apps/files/l10n/fr.php +++ b/apps/files/l10n/fr.php @@ -15,6 +15,7 @@ "replaced" => "remplacé", "undo" => "annuler", "with" => "avec", +"unshared" => "non partagée", "deleted" => "supprimé", "generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ; cela peut prendre du temps.", "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.", diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php new file mode 100644 index 0000000000..27fa634c03 --- /dev/null +++ b/apps/files_sharing/l10n/zh_TW.php @@ -0,0 +1,6 @@ + "密碼", +"Submit" => "送出", +"Download" => "下載", +"No preview available for" => "無法預覽" +); diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php index d136ae241c..cfc48537e0 100644 --- a/apps/files_versions/l10n/et_EE.php +++ b/apps/files_versions/l10n/et_EE.php @@ -1,4 +1,6 @@ "Kõikide versioonide aegumine", +"Versions" => "Versioonid", +"This will delete all existing backup versions of your files" => "See kustutab kõik sinu failidest tehtud varuversiooni", "Enable Files Versioning" => "Luba failide versioonihaldus" ); diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php index d62e1212dc..f83142225e 100644 --- a/apps/user_ldap/l10n/et_EE.php +++ b/apps/user_ldap/l10n/et_EE.php @@ -1,9 +1,31 @@ "Host", +"Base DN" => "Baas DN", +"User DN" => "Kasutaja DN", "Password" => "Parool", +"User Login Filter" => "Kasutajanime filter", +"use %%uid placeholder, e.g. \"uid=%%uid\"" => "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\"", +"User List Filter" => "Kasutajate nimekirja filter", +"Defines the filter to apply, when retrieving users." => "Määrab kasutajaid hankides filtri, mida rakendatakse.", +"without any placeholder, e.g. \"objectClass=person\"." => "ilma ühegi kohatäitjata, nt. \"objectClass=person\".", "Group Filter" => "Grupi filter", +"Defines the filter to apply, when retrieving groups." => "Määrab gruppe hankides filtri, mida rakendatakse.", +"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\".", "Port" => "Port", +"Base User Tree" => "Baaskasutaja puu", +"Base Group Tree" => "Baasgrupi puu", +"Group-Member association" => "Grupiliikme seotus", "Use TLS" => "Kasutaja TLS", +"Do not use it for SSL connections, it will fail." => "Ära kasuta seda SSL ühenduse jaoks, see ei toimi.", +"Case insensitve LDAP server (Windows)" => "Mittetõstutundlik LDAP server (Windows)", +"Turn off SSL certificate validation." => "Lülita SSL sertifikaadi kontrollimine välja.", +"Not recommended, use for testing only." => "Pole soovitatav, kasuta ainult testimiseks.", +"User Display Name Field" => "Kasutaja näidatava nime väli", +"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks.", +"Group Display Name Field" => "Grupi näidatava nime väli", +"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks.", "in bytes" => "baitides", +"in seconds. A change empties the cache." => "sekundites. Muudatus tühjendab vahemälu.", +"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.", "Help" => "Abiinfo" ); diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po index 7ce5cdf145..a2e851dd2f 100644 --- a/l10n/et_EE/files.po +++ b/l10n/et_EE/files.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Rivo Zängov , 2011, 2012. +# Rivo Zängov , 2011-2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" +"PO-Revision-Date: 2012-09-11 10:21+0000\n" +"Last-Translator: Rivo Zängov \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -54,7 +54,7 @@ msgstr "Failid" #: js/fileactions.js:108 templates/index.php:62 msgid "Unshare" -msgstr "" +msgstr "Lõpeta jagamine" #: js/fileactions.js:110 templates/index.php:64 msgid "Delete" @@ -70,7 +70,7 @@ msgstr "asenda" #: js/filelist.js:186 msgid "suggest name" -msgstr "" +msgstr "soovita nime" #: js/filelist.js:186 js/filelist.js:188 msgid "cancel" @@ -90,7 +90,7 @@ msgstr "millega" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "jagamata" #: js/filelist.js:270 msgid "deleted" @@ -119,7 +119,7 @@ msgstr "Üleslaadimine tühistati." #: js/files.js:423 msgid "" "File upload is in progress. Leaving the page now will cancel the upload." -msgstr "" +msgstr "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise." #: js/files.js:493 msgid "Invalid name, '/' is not allowed." @@ -179,7 +179,7 @@ msgstr "Maksimaalne ZIP-faili sisestatava faili suurus" #: templates/admin.php:14 msgid "Save" -msgstr "" +msgstr "Salvesta" #: templates/index.php:7 msgid "New" diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po index afd1bc89da..4344220fe7 100644 --- a/l10n/et_EE/files_versions.po +++ b/l10n/et_EE/files_versions.po @@ -8,15 +8,15 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-01 13:35+0200\n" -"PO-Revision-Date: 2012-09-01 11:35+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" +"PO-Revision-Date: 2012-09-11 10:28+0000\n" +"Last-Translator: Rivo Zängov \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: et_EE\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: js/settings-personal.js:31 templates/settings-personal.php:10 msgid "Expire all versions" @@ -24,11 +24,11 @@ msgstr "Kõikide versioonide aegumine" #: templates/settings-personal.php:4 msgid "Versions" -msgstr "" +msgstr "Versioonid" #: templates/settings-personal.php:7 msgid "This will delete all existing backup versions of your files" -msgstr "" +msgstr "See kustutab kõik sinu failidest tehtud varuversiooni" #: templates/settings.php:3 msgid "Enable Files Versioning" diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po index 789beb732b..da4dcfe526 100644 --- a/l10n/et_EE/lib.po +++ b/l10n/et_EE/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 \n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" +"PO-Revision-Date: 2012-09-11 10:18+0000\n" +"Last-Translator: Rivo Zängov \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: et_EE\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 "Abiinfo" -#: app.php:295 +#: app.php:292 msgid "Personal" msgstr "Isiklik" -#: app.php:300 +#: app.php:297 msgid "Settings" msgstr "Seaded" -#: app.php:305 +#: app.php:302 msgid "Users" msgstr "Kasutajad" -#: app.php:312 +#: app.php:309 msgid "Apps" msgstr "Rakendused" -#: app.php:314 +#: app.php:311 msgid "Admin" msgstr "Admin" @@ -70,57 +70,57 @@ msgstr "Autentimise viga" msgid "Token expired. Please reload page." msgstr "Kontrollkood aegus. Paelun lae leht uuesti." -#: template.php:86 +#: template.php:87 msgid "seconds ago" msgstr "sekundit tagasi" -#: template.php:87 +#: template.php:88 msgid "1 minute ago" msgstr "1 minut tagasi" -#: template.php:88 +#: template.php:89 #, php-format msgid "%d minutes ago" msgstr "%d minutit tagasi" -#: template.php:91 +#: template.php:92 msgid "today" msgstr "täna" -#: template.php:92 +#: template.php:93 msgid "yesterday" msgstr "eile" -#: template.php:93 +#: template.php:94 #, php-format msgid "%d days ago" msgstr "%d päeva tagasi" -#: template.php:94 +#: template.php:95 msgid "last month" msgstr "eelmisel kuul" -#: template.php:95 +#: template.php:96 msgid "months ago" msgstr "kuud tagasi" -#: template.php:96 +#: template.php:97 msgid "last year" msgstr "eelmisel aastal" -#: template.php:97 +#: template.php:98 msgid "years ago" msgstr "aastat tagasi" #: updater.php:66 #, php-format msgid "%s is available. Get more information" -msgstr "" +msgstr "%s on saadaval. Vaata lisainfot" #: updater.php:68 msgid "up to date" -msgstr "" +msgstr "ajakohane" #: updater.php:71 msgid "updates check is disabled" -msgstr "" +msgstr "uuenduste kontrollimine on välja lülitatud" diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po index 2060adcac0..90042b1958 100644 --- a/l10n/et_EE/settings.po +++ b/l10n/et_EE/settings.po @@ -4,14 +4,14 @@ # # Translators: # , 2012. -# Rivo Zängov , 2011, 2012. +# Rivo Zängov , 2011-2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-05 02:02+0200\n" -"PO-Revision-Date: 2012-09-05 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" +"PO-Revision-Date: 2012-09-11 11:12+0000\n" +"Last-Translator: Rivo Zängov \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,11 +30,11 @@ msgstr "Autentimise viga" #: ajax/creategroup.php:19 msgid "Group already exists" -msgstr "" +msgstr "Grupp on juba olemas" #: ajax/creategroup.php:28 msgid "Unable to add group" -msgstr "" +msgstr "Keela grupi lisamine" #: ajax/lostpassword.php:14 msgid "Email saved" @@ -54,11 +54,11 @@ msgstr "Vigane päring" #: ajax/removegroup.php:16 msgid "Unable to delete group" -msgstr "" +msgstr "Keela grupi kustutamine" #: ajax/removeuser.php:22 msgid "Unable to delete user" -msgstr "" +msgstr "Keela kasutaja kustutamine" #: ajax/setlanguage.php:18 msgid "Language changed" @@ -67,12 +67,12 @@ msgstr "Keel on muudetud" #: ajax/togglegroups.php:25 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "Kasutajat ei saa lisada gruppi %s" #: ajax/togglegroups.php:31 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "Kasutajat ei saa eemaldada grupist %s" #: js/apps.js:18 msgid "Error" @@ -125,39 +125,39 @@ msgstr "kasuta süsteemide cron teenuseid" #: templates/admin.php:41 msgid "Share API" -msgstr "" +msgstr "Jagamise API" #: templates/admin.php:46 msgid "Enable Share API" -msgstr "" +msgstr "Luba jagamise API" #: templates/admin.php:47 msgid "Allow apps to use the Share API" -msgstr "" +msgstr "Luba rakendustel kasutada jagamise API-t" #: templates/admin.php:51 msgid "Allow links" -msgstr "" +msgstr "Luba linke" #: templates/admin.php:52 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "Luba kasutajatel jagada kirjeid avalike linkidega" #: templates/admin.php:56 msgid "Allow resharing" -msgstr "" +msgstr "Luba edasijagamine" #: templates/admin.php:57 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud" #: templates/admin.php:60 msgid "Allow users to share with anyone" -msgstr "" +msgstr "Luba kasutajatel kõigiga jagada" #: templates/admin.php:62 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad" #: templates/admin.php:69 msgid "Log" @@ -191,7 +191,7 @@ msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com" #: templates/apps.php:30 msgid "-licensed by " -msgstr "" +msgstr "-litsenseeritud " #: templates/help.php:9 msgid "Documentation" diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po index 80d9727ff0..d955f91c9d 100644 --- a/l10n/et_EE/user_ldap.po +++ b/l10n/et_EE/user_ldap.po @@ -8,15 +8,15 @@ 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 \n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" +"PO-Revision-Date: 2012-09-11 10:46+0000\n" +"Last-Translator: Rivo Zängov \n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: et_EE\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: templates/settings.php:8 msgid "Host" @@ -29,7 +29,7 @@ msgstr "" #: templates/settings.php:9 msgid "Base DN" -msgstr "" +msgstr "Baas DN" #: templates/settings.php:9 msgid "You can specify Base DN for users and groups in the Advanced tab" @@ -37,7 +37,7 @@ msgstr "" #: templates/settings.php:10 msgid "User DN" -msgstr "" +msgstr "Kasutaja DN" #: templates/settings.php:10 msgid "" @@ -56,7 +56,7 @@ msgstr "" #: templates/settings.php:12 msgid "User Login Filter" -msgstr "" +msgstr "Kasutajanime filter" #: templates/settings.php:12 #, php-format @@ -68,19 +68,19 @@ msgstr "" #: templates/settings.php:12 #, php-format msgid "use %%uid placeholder, e.g. \"uid=%%uid\"" -msgstr "" +msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\"" #: templates/settings.php:13 msgid "User List Filter" -msgstr "" +msgstr "Kasutajate nimekirja filter" #: templates/settings.php:13 msgid "Defines the filter to apply, when retrieving users." -msgstr "" +msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse." #: templates/settings.php:13 msgid "without any placeholder, e.g. \"objectClass=person\"." -msgstr "" +msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"." #: templates/settings.php:14 msgid "Group Filter" @@ -88,11 +88,11 @@ msgstr "Grupi filter" #: templates/settings.php:14 msgid "Defines the filter to apply, when retrieving groups." -msgstr "" +msgstr "Määrab gruppe hankides filtri, mida rakendatakse." #: templates/settings.php:14 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"." -msgstr "" +msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"." #: templates/settings.php:17 msgid "Port" @@ -100,15 +100,15 @@ msgstr "Port" #: templates/settings.php:18 msgid "Base User Tree" -msgstr "" +msgstr "Baaskasutaja puu" #: templates/settings.php:19 msgid "Base Group Tree" -msgstr "" +msgstr "Baasgrupi puu" #: templates/settings.php:20 msgid "Group-Member association" -msgstr "" +msgstr "Grupiliikme seotus" #: templates/settings.php:21 msgid "Use TLS" @@ -116,15 +116,15 @@ msgstr "Kasutaja TLS" #: templates/settings.php:21 msgid "Do not use it for SSL connections, it will fail." -msgstr "" +msgstr "Ära kasuta seda SSL ühenduse jaoks, see ei toimi." #: templates/settings.php:22 msgid "Case insensitve LDAP server (Windows)" -msgstr "" +msgstr "Mittetõstutundlik LDAP server (Windows)" #: templates/settings.php:23 msgid "Turn off SSL certificate validation." -msgstr "" +msgstr "Lülita SSL sertifikaadi kontrollimine välja." #: templates/settings.php:23 msgid "" @@ -134,23 +134,23 @@ msgstr "" #: templates/settings.php:23 msgid "Not recommended, use for testing only." -msgstr "" +msgstr "Pole soovitatav, kasuta ainult testimiseks." #: templates/settings.php:24 msgid "User Display Name Field" -msgstr "" +msgstr "Kasutaja näidatava nime väli" #: templates/settings.php:24 msgid "The LDAP attribute to use to generate the user`s ownCloud name." -msgstr "" +msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks." #: templates/settings.php:25 msgid "Group Display Name Field" -msgstr "" +msgstr "Grupi näidatava nime väli" #: templates/settings.php:25 msgid "The LDAP attribute to use to generate the groups`s ownCloud name." -msgstr "" +msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks." #: templates/settings.php:27 msgid "in bytes" @@ -158,13 +158,13 @@ msgstr "baitides" #: templates/settings.php:29 msgid "in seconds. A change empties the cache." -msgstr "" +msgstr "sekundites. Muudatus tühjendab vahemälu." #: templates/settings.php:30 msgid "" "Leave empty for user name (default). Otherwise, specify an LDAP/AD " "attribute." -msgstr "" +msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus." #: templates/settings.php:32 msgid "Help" diff --git a/l10n/fr/files.po b/l10n/fr/files.po index bd3172a21d..c60dcb1567 100644 --- a/l10n/fr/files.po +++ b/l10n/fr/files.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-08 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" +"PO-Revision-Date: 2012-09-11 14:35+0000\n" +"Last-Translator: Geoffrey Guerrier \n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -98,7 +98,7 @@ msgstr "avec" #: js/filelist.js:268 msgid "unshared" -msgstr "" +msgstr "non partagée" #: js/filelist.js:270 msgid "deleted" diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po index 2b830ce906..53b8f54895 100644 --- a/l10n/ru/settings.po +++ b/l10n/ru/settings.po @@ -16,8 +16,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-09 02:01+0200\n" -"PO-Revision-Date: 2012-09-08 12:08+0000\n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" +"PO-Revision-Date: 2012-09-11 01:35+0000\n" "Last-Translator: VicDeo \n" "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n" "MIME-Version: 1.0\n" @@ -87,7 +87,7 @@ msgstr "Ошибка" #: js/apps.js:39 js/apps.js:73 msgid "Disable" -msgstr "Отключить" +msgstr "Выключить" #: js/apps.js:39 js/apps.js:62 msgid "Enable" @@ -112,7 +112,7 @@ msgid "" "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." -msgstr "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или перенести каталог data за пределы корневого каталога веб-сервера." +msgstr "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера." #: templates/admin.php:31 msgid "Cron" @@ -124,7 +124,7 @@ msgstr "Запускать задание при загрузке каждой #: templates/admin.php:35 msgid "cron.php is registered at a webcron service" -msgstr "cron.php зарегистрирован в webcron сервисе" +msgstr "cron.php зарегистрирован в службе webcron" #: templates/admin.php:37 msgid "use systems cron service" @@ -132,15 +132,15 @@ msgstr "использовать системные задания" #: templates/admin.php:41 msgid "Share API" -msgstr "API общего доступа" +msgstr "API публикации" #: templates/admin.php:46 msgid "Enable Share API" -msgstr "Включить API общего доступа" +msgstr "Включить API публикации" #: templates/admin.php:47 msgid "Allow apps to use the Share API" -msgstr "Разрешить приложениям доступ к API общего доступа" +msgstr "Разрешить API публикации для приложений" #: templates/admin.php:51 msgid "Allow links" @@ -148,23 +148,23 @@ msgstr "Разрешить ссылки" #: templates/admin.php:52 msgid "Allow users to share items to the public with links" -msgstr "Разрешить пользователям предоставлять публичный доступ при помощи ссылок" +msgstr "Разрешить пользователям публикацию при помощи ссылок" #: templates/admin.php:56 msgid "Allow resharing" -msgstr "Включить расширенный общий доступ" +msgstr "Включить повторную публикацию" #: templates/admin.php:57 msgid "Allow users to share items shared with them again" -msgstr "Разрешить пользователям отдавать в общий доступ доступные им элементы других пользователей" +msgstr "Разрешить пользователям публиковать доступные им элементы других пользователей" #: templates/admin.php:60 msgid "Allow users to share with anyone" -msgstr "Разрешить предоставлять общий доступ любым пользователям" +msgstr "Разрешить публиковать для любых пользователей" #: templates/admin.php:62 msgid "Allow users to only share with users in their groups" -msgstr "Ограничить общий доступ группами пользователя" +msgstr "Ограничить публикацию группами пользователя" #: templates/admin.php:69 msgid "Log" diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot index d9f9f4de0e..13cf5608b9 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-11 02:02+0200\n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot index bfc75b5455..ea363823aa 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-11 02:02+0200\n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot index 0f964a37ff..02737458e0 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-11 02:02+0200\n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot index 98d019bb92..75f49385fd 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-11 02:02+0200\n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot index b10575b0c7..2eec3ef024 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-11 02:02+0200\n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot index 0368a7d338..7bc25825f9 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-11 02:02+0200\n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot index d30053736d..c1f018d3ec 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-11 02:02+0200\n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot index 93f7e40d44..33da8992be 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-11 02:02+0200\n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot index 89ab2c5695..86f79b98fc 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-11 02:02+0200\n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po index 3699385698..0b9f8057b5 100644 --- a/l10n/zh_TW/files_sharing.po +++ b/l10n/zh_TW/files_sharing.po @@ -3,36 +3,37 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# , 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:03+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" +"PO-Revision-Date: 2012-09-11 15:56+0000\n" +"Last-Translator: Jeff5555 \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_TW\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\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 msgid "Download" -msgstr "" +msgstr "下載" #: templates/public.php:18 msgid "No preview available for" -msgstr "" +msgstr "無法預覽" -#: templates/public.php:23 +#: templates/public.php:25 msgid "web services under your control" msgstr "" diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po index ed6dc81bc1..64bf08a813 100644 --- a/l10n/zh_TW/settings.po +++ b/l10n/zh_TW/settings.po @@ -5,14 +5,15 @@ # Translators: # Donahue Chuang , 2012. # , 2012. +# , 2012. # ywang , 2012. msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-09-05 02:02+0200\n" -"PO-Revision-Date: 2012-09-05 00:02+0000\n" -"Last-Translator: I Robot \n" +"POT-Creation-Date: 2012-09-12 02:01+0200\n" +"PO-Revision-Date: 2012-09-11 15:49+0000\n" +"Last-Translator: Jeff5555 \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,11 +32,11 @@ msgstr "認證錯誤" #: ajax/creategroup.php:19 msgid "Group already exists" -msgstr "" +msgstr "群組已存在" #: ajax/creategroup.php:28 msgid "Unable to add group" -msgstr "" +msgstr "群組增加失敗" #: ajax/lostpassword.php:14 msgid "Email saved" @@ -55,11 +56,11 @@ msgstr "無效請求" #: ajax/removegroup.php:16 msgid "Unable to delete group" -msgstr "" +msgstr "群組刪除錯誤" #: ajax/removeuser.php:22 msgid "Unable to delete user" -msgstr "" +msgstr "使用者刪除錯誤" #: ajax/setlanguage.php:18 msgid "Language changed" @@ -68,12 +69,12 @@ msgstr "語言已變更" #: ajax/togglegroups.php:25 #, php-format msgid "Unable to add user to group %s" -msgstr "" +msgstr "使用者加入群組%s錯誤" #: ajax/togglegroups.php:31 #, php-format msgid "Unable to remove user from group %s" -msgstr "" +msgstr "使用者移出群組%s錯誤" #: js/apps.js:18 msgid "Error" @@ -110,11 +111,11 @@ msgstr "" #: templates/admin.php:31 msgid "Cron" -msgstr "" +msgstr "定期執行" #: templates/admin.php:33 msgid "execute one task with each page loaded" -msgstr "" +msgstr "當頁面載入時，執行" #: templates/admin.php:35 msgid "cron.php is registered at a webcron service" @@ -122,7 +123,7 @@ msgstr "" #: templates/admin.php:37 msgid "use systems cron service" -msgstr "" +msgstr "使用系統定期執行服務" #: templates/admin.php:41 msgid "Share API" @@ -138,27 +139,27 @@ msgstr "" #: templates/admin.php:51 msgid "Allow links" -msgstr "" +msgstr "允許連結" #: templates/admin.php:52 msgid "Allow users to share items to the public with links" -msgstr "" +msgstr "允許使用者以結連公開分享檔案" #: templates/admin.php:56 msgid "Allow resharing" -msgstr "" +msgstr "允許轉貼分享" #: templates/admin.php:57 msgid "Allow users to share items shared with them again" -msgstr "" +msgstr "允許使用者轉貼共享檔案" #: templates/admin.php:60 msgid "Allow users to share with anyone" -msgstr "" +msgstr "允許使用者公開分享" #: templates/admin.php:62 msgid "Allow users to only share with users in their groups" -msgstr "" +msgstr "僅允許使用者在群組內分享" #: templates/admin.php:69 msgid "Log" @@ -308,7 +309,7 @@ msgstr "其他" #: templates/users.php:80 templates/users.php:112 msgid "Group Admin" -msgstr "" +msgstr "群組 管理員" #: templates/users.php:82 msgid "Quota" diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php index d8da90a3cb..87f222af83 100644 --- a/lib/l10n/et_EE.php +++ b/lib/l10n/et_EE.php @@ -21,5 +21,8 @@ "last month" => "eelmisel kuul", "months ago" => "kuud tagasi", "last year" => "eelmisel aastal", -"years ago" => "aastat tagasi" +"years ago" => "aastat tagasi", +"%s is available. Get more information" => "%s on saadaval. Vaata lisainfot", +"up to date" => "ajakohane", +"updates check is disabled" => "uuenduste kontrollimine on välja lülitatud" ); diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php index 1f6cf1265d..ef36dbf951 100644 --- a/settings/l10n/et_EE.php +++ b/settings/l10n/et_EE.php @@ -1,11 +1,17 @@ "App Sotre'i nimekirja laadimine ebaõnnestus", "Authentication error" => "Autentimise viga", +"Group already exists" => "Grupp on juba olemas", +"Unable to add group" => "Keela grupi lisamine", "Email saved" => "Kiri on salvestatud", "Invalid email" => "Vigane e-post", "OpenID Changed" => "OpenID on muudetud", "Invalid request" => "Vigane päring", +"Unable to delete group" => "Keela grupi kustutamine", +"Unable to delete user" => "Keela kasutaja kustutamine", "Language changed" => "Keel on muudetud", +"Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s", +"Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s", "Error" => "Viga", "Disable" => "Lülita välja", "Enable" => "Lülita sisse", @@ -16,11 +22,21 @@ "execute one task with each page loaded" => "käivita iga laetud lehe juures üks ülesanne", "cron.php is registered at a webcron service" => "cron.php on webcron teenuses registreeritud", "use systems cron service" => "kasuta süsteemide cron teenuseid", +"Share API" => "Jagamise API", +"Enable Share API" => "Luba jagamise API", +"Allow apps to use the Share API" => "Luba rakendustel kasutada jagamise API-t", +"Allow links" => "Luba linke", +"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega", +"Allow resharing" => "Luba edasijagamine", +"Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud", +"Allow users to share with anyone" => "Luba kasutajatel kõigiga jagada", +"Allow users to only share with users in their groups" => "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad", "Log" => "Logi", "More" => "Veel", "Add your App" => "Lisa oma rakendus", "Select an App" => "Vali programm", "See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com", +"-licensed by " => "-litsenseeritud ", "Documentation" => "Dokumentatsioon", "Managing Big Files" => "Suurte failide haldamine", "Ask a question" => "Küsi küsimus", diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php index bab81560be..4e0a7e7d78 100644 --- a/settings/l10n/ru.php +++ b/settings/l10n/ru.php @@ -13,25 +13,25 @@ "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s", "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s", "Error" => "Ошибка", -"Disable" => "Отключить", +"Disable" => "Выключить", "Enable" => "Включить", "Saving..." => "Сохранение...", "__language_name__" => "Русский ", "Security Warning" => "Предупреждение безопасности", -"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или перенести каталог data за пределы корневого каталога веб-сервера.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера.", "Cron" => "Задание", "execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы", -"cron.php is registered at a webcron service" => "cron.php зарегистрирован в webcron сервисе", +"cron.php is registered at a webcron service" => "cron.php зарегистрирован в службе webcron", "use systems cron service" => "использовать системные задания", -"Share API" => "API общего доступа", -"Enable Share API" => "Включить API общего доступа", -"Allow apps to use the Share API" => "Разрешить приложениям доступ к API общего доступа", +"Share API" => "API публикации", +"Enable Share API" => "Включить API публикации", +"Allow apps to use the Share API" => "Разрешить API публикации для приложений", "Allow links" => "Разрешить ссылки", -"Allow users to share items to the public with links" => "Разрешить пользователям предоставлять публичный доступ при помощи ссылок", -"Allow resharing" => "Включить расширенный общий доступ", -"Allow users to share items shared with them again" => "Разрешить пользователям отдавать в общий доступ доступные им элементы других пользователей", -"Allow users to share with anyone" => "Разрешить предоставлять общий доступ любым пользователям", -"Allow users to only share with users in their groups" => "Ограничить общий доступ группами пользователя", +"Allow users to share items to the public with links" => "Разрешить пользователям публикацию при помощи ссылок", +"Allow resharing" => "Включить повторную публикацию", +"Allow users to share items shared with them again" => "Разрешить пользователям публиковать доступные им элементы других пользователей", +"Allow users to share with anyone" => "Разрешить публиковать для любых пользователей", +"Allow users to only share with users in their groups" => "Ограничить публикацию группами пользователя", "Log" => "Журнал", "More" => "Ещё", "Developed by the ownCloud community, the source code is licensed under the AGPL." => "Разрабатывается сообществом ownCloud, исходный код доступен под лицензией AGPL.", diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php index e0eeddb375..4f72c8398b 100644 --- a/settings/l10n/zh_TW.php +++ b/settings/l10n/zh_TW.php @@ -1,17 +1,32 @@ "無法從 App Store 讀取清單", "Authentication error" => "認證錯誤", +"Group already exists" => "群組已存在", +"Unable to add group" => "群組增加失敗", "Email saved" => "Email已儲存", "Invalid email" => "無效的email", "OpenID Changed" => "OpenID 已變更", "Invalid request" => "無效請求", +"Unable to delete group" => "群組刪除錯誤", +"Unable to delete user" => "使用者刪除錯誤", "Language changed" => "語言已變更", +"Unable to add user to group %s" => "使用者加入群組%s錯誤", +"Unable to remove user from group %s" => "使用者移出群組%s錯誤", "Error" => "錯誤", "Disable" => "停用", "Enable" => "啟用", "Saving..." => "儲存中...", "__language_name__" => "__語言_名稱__", "Security Warning" => "安全性警告", +"Cron" => "定期執行", +"execute one task with each page loaded" => "當頁面載入時，執行", +"use systems cron service" => "使用系統定期執行服務", +"Allow links" => "允許連結", +"Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案", +"Allow resharing" => "允許轉貼分享", +"Allow users to share items shared with them again" => "允許使用者轉貼共享檔案", +"Allow users to share with anyone" => "允許使用者公開分享", +"Allow users to only share with users in their groups" => "僅允許使用者在群組內分享", "Log" => "紀錄", "More" => "更多", "Add your App" => "添加你的 App", @@ -45,6 +60,7 @@ "Create" => "創造", "Default Quota" => "預設容量限制", "Other" => "其他", +"Group Admin" => "群組 管理員", "Quota" => "容量限制", "Delete" => "刪除" ); From b194ac3ddeeab6ce923a313725b3ce85fe849baa Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 12 Sep 2012 01:01:45 -0400 Subject: [PATCH 050/205] Add expiration column to share table and bump version number --- db_structure.xml | 7 +++++++ lib/util.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/db_structure.xml b/db_structure.xml index 8c96fa7c39..d4299e1e8a 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -563,6 +563,13 @@ 1 + + expiration + timestamp + + false + + diff --git a/lib/util.php b/lib/util.php index 3b2f476ada..01f53cb2f3 100755 --- a/lib/util.php +++ b/lib/util.php @@ -75,7 +75,7 @@ class OC_Util { * @return array */ public static function getVersion(){ - return array(4,82,4); + return array(4,82,5); } /** From 8f0354bcddb466006689f86369c9e27170ea691b Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 12 Sep 2012 00:23:45 -0400 Subject: [PATCH 051/205] Temporarily disable sharing with contacts and emails, will come in next release --- core/ajax/share.php | 34 +++++++++++++++++----------------- core/js/share.js | 10 +++++----- lib/public/share.php | 40 ++++++++++++++++++++-------------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/core/ajax/share.php b/core/ajax/share.php index 5b6763c08e..b8e88acec2 100644 --- a/core/ajax/share.php +++ b/core/ajax/share.php @@ -82,23 +82,23 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo case 'getShareWith': if (isset($_GET['search'])) { $shareWith = array(); - if (OC_App::isEnabled('contacts')) { - // TODO Add function to contacts to only get the 'fullname' column to improve performance - $ids = OC_Contacts_Addressbook::activeIds(); - foreach ($ids as $id) { - $vcards = OC_Contacts_VCard::all($id); - foreach ($vcards as $vcard) { - $contact = $vcard['fullname']; - if (stripos($contact, $_GET['search']) !== false - && (!isset($_GET['itemShares']) - || !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]) - || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]) - || !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) { - $shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id'])); - } - } - } - } +// if (OC_App::isEnabled('contacts')) { +// // TODO Add function to contacts to only get the 'fullname' column to improve performance +// $ids = OC_Contacts_Addressbook::activeIds(); +// foreach ($ids as $id) { +// $vcards = OC_Contacts_VCard::all($id); +// foreach ($vcards as $vcard) { +// $contact = $vcard['fullname']; +// if (stripos($contact, $_GET['search']) !== false +// && (!isset($_GET['itemShares']) +// || !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]) +// || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]) +// || !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) { +// $shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id'])); +// } +// } +// } +// } $count = 0; $users = array(); $limit = 0; diff --git a/core/js/share.js b/core/js/share.js index 535ae6da99..e85c134f82 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -167,12 +167,12 @@ OC.Share={ response(result.data); } else { // 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}}]); - } else { +// 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}}]); +// } else { response(['No people found']); - } +// } } }); // } diff --git a/lib/public/share.php b/lib/public/share.php index ccb5a56ac7..9d2c98e417 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -252,26 +252,26 @@ class Share { \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); throw new \Exception($message); return false; - } else if ($shareType === self::SHARE_TYPE_CONTACT) { - if (!\OC_App::isEnabled('contacts')) { - $message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled'; - \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); - return false; - } - $vcard = \OC_Contacts_App::getContactVCard($shareWith); - if (!isset($vcard)) { - $message = 'Sharing '.$itemSource.' failed, because the contact does not exist'; - \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); - throw new \Exception($message); - } - $details = \OC_Contacts_VCard::structureContact($vcard); - // TODO Add ownCloud user to contacts vcard - if (!isset($details['EMAIL'])) { - $message = 'Sharing '.$itemSource.' failed, because no email address is associated with the contact'; - \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); - throw new \Exception($message); - } - return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions); +// } else if ($shareType === self::SHARE_TYPE_CONTACT) { +// if (!\OC_App::isEnabled('contacts')) { +// $message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled'; +// \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); +// return false; +// } +// $vcard = \OC_Contacts_App::getContactVCard($shareWith); +// if (!isset($vcard)) { +// $message = 'Sharing '.$itemSource.' failed, because the contact does not exist'; +// \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); +// throw new \Exception($message); +// } +// $details = \OC_Contacts_VCard::structureContact($vcard); +// // TODO Add ownCloud user to contacts vcard +// if (!isset($details['EMAIL'])) { +// $message = 'Sharing '.$itemSource.' failed, because no email address is associated with the contact'; +// \OC_Log::write('OCP\Share', $message, \OC_Log::ERROR); +// throw new \Exception($message); +// } +// return self::shareItem($itemType, $itemSource, self::SHARE_TYPE_EMAIL, $details['EMAIL'], $permissions); } else { // Future share types need to include their own conditions $message = 'Share type '.$shareType.' is not valid for '.$itemSource; From 54d4e556fe3302d1e580cb6d4abbfcd5699263a5 Mon Sep 17 00:00:00 2001 From: Michael Gapczynski Date: Wed, 12 Sep 2012 00:57:01 -0400 Subject: [PATCH 052/205] Add lock and clock icon for sharing --- AUTHORS | 3 +++ core/img/actions/clock.png | Bin 0 -> 466 bytes core/img/actions/clock.svg | 20 ++++++++++++++++++++ core/img/actions/lock.png | Bin 0 -> 346 bytes core/img/actions/lock.svg | 8 ++++++++ core/js/share.js | 3 +-- 6 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 core/img/actions/clock.png create mode 100755 core/img/actions/clock.svg create mode 100644 core/img/actions/lock.png create mode 100755 core/img/actions/lock.svg diff --git a/AUTHORS b/AUTHORS index f618df9311..f79733c250 100644 --- a/AUTHORS +++ b/AUTHORS @@ -19,3 +19,6 @@ With help from many libraries and frameworks including: SabreDAV jQuery … + +"Lock” symbol from thenounproject.com collection +"Clock” symbol by Brandon Hopkins, from thenounproject.com collection \ No newline at end of file diff --git a/core/img/actions/clock.png b/core/img/actions/clock.png new file mode 100644 index 0000000000000000000000000000000000000000..671b3f4f0c1daf8bbea5eb8c8881b07e79ec3b4c GIT binary patch literal 466 zcmV;@0WJQCP)OKTbN14s%*1qDH{^a}_Y{L@(&NCFm`Z(%2zq!KLzLDLw<;@%hT zhPRpK@n+_nnRn*A6cOr3Db3;*7IC_yzu_ZRBjWoAAR-i!E*@dKJkR4QuHYgbV+Z%p zIlxumw|IvkhD}4M-^6vy;yqqABu&G^0`6i0$18Bc7o01#ZXvnTeEv*Xdj^w-Cf~p_ zY*o3bvdInxog&x^1SXBfS=`2(DmR6Hc!g!y!i9QrHSGcR&~K?-!iNsdpl^JvMa1ux zd>`|@^0Ge$ypFXowSDNx0{&_1h=|WeY_^B5J=tMPDWxCy8xg;b07)rL%jaCeC$e$2 z|j+EYz~7Kf+0>}6VH(j2r81h zWwj^rov&d5m+`dJRvK_b6qZqu2C~BzF)ur``JG=!#Lv3_KdxZutm_X>mjD0&07*qo IM6N<$g5^5J6#xJL literal 0 HcmV?d00001 diff --git a/core/img/actions/clock.svg b/core/img/actions/clock.svg new file mode 100755 index 0000000000..1821f474df --- /dev/null +++ b/core/img/actions/clock.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png new file mode 100644 index 0000000000000000000000000000000000000000..511bfa615bb4b28755140658d0f868cb3fe411ec GIT binary patch literal 346 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ z@ErkR#;MwT(m=sKo-U3d7QJsL8fLX52(-o@Qi{3}k@b|7g?r;Skw>N?bvij~Tt0}H z#kmP=*(8vA#BcU}r`ev9bqd3sIijD19zHWWKTYC7=c!F9*GoOGmtHEJYjb|_s#WLK zeCcCzopr0NoXd6aWAK literal 0 HcmV?d00001 diff --git a/core/img/actions/lock.svg b/core/img/actions/lock.svg new file mode 100755 index 0000000000..8fb039b9e3 --- /dev/null +++ b/core/img/actions/lock.svg @@ -0,0 +1,8 @@ + + + + + + diff --git a/core/js/share.js b/core/js/share.js index e85c134f82..3fe1f25961 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -132,8 +132,7 @@ OC.Share={ if (link) { html += '